From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Masami Hiramatsu" <masami.hiramatsu@linaro.org>,
"Paul Durrant" <paul@xen.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v1 03/10] meson.build: fix building of Xen support for aarch64
Date: Tue, 10 Nov 2020 19:23:09 +0000 [thread overview]
Message-ID: <20201110192316.26397-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org>
Xen is supported on ARM although weirdly using the i386-softmmu model.
Checking based on the host CPU meant we never enabled Xen support. It
would be nice to enable CONFIG_XEN for aarch64-softmmu to make it not
seem weird but that will require further build surgery.
Fixes: 8a19980e3f ("configure: move accelerator logic to meson")
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
Message-Id: <20201105175153.30489-9-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
meson.build | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index b473620321..ef197f9a6b 100644
--- a/meson.build
+++ b/meson.build
@@ -74,10 +74,15 @@ else
endif
accelerator_targets = { 'CONFIG_KVM': kvm_targets }
+if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
+ # i368 emulator provides xenpv machine type for multiple architectures
+ accelerator_targets += {
+ 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
+ }
+endif
if cpu in ['x86', 'x86_64']
accelerator_targets += {
'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'],
- 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
'CONFIG_HVF': ['x86_64-softmmu'],
'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'],
}
--
2.20.1
next prev parent reply other threads:[~2020-11-10 19:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 19:23 [PATCH v1 for 5.1 00/10] various fixes (CI, Xen, plugins) Alex Bennée
2020-11-10 19:23 ` [PATCH v1 01/10] plugins: Fix resource leak in connect_socket() Alex Bennée
2020-11-10 19:23 ` [PATCH v1 02/10] plugins: Fix two resource leaks in setup_socket() Alex Bennée
2020-11-10 19:23 ` Alex Bennée [this message]
2020-11-10 19:23 ` [PATCH v1 04/10] include/hw/xen.h: drop superfluous struct Alex Bennée
2020-11-10 19:23 ` [PATCH v1 05/10] stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub Alex Bennée
2020-11-10 19:23 ` [PATCH v1 06/10] accel/stubs: drop unused cpu.h include Alex Bennée
2020-11-10 19:23 ` [PATCH v1 07/10] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off Alex Bennée
2020-11-11 11:52 ` Igor Mammedov
2020-11-10 19:23 ` [PATCH v1 08/10] tests/acceptance: Disable Spartan-3A DSP 1800A test Alex Bennée
2020-11-10 19:23 ` [PATCH v1 09/10] gitlab: move remaining x86 check-tcg targets to gitlab Alex Bennée
2020-11-10 19:23 ` [PATCH v1 10/10] scripts/ci: clean up default args logic a little Alex Bennée
2020-11-10 22:50 ` [PATCH v1 for 5.1 00/10] various fixes (CI, Xen, plugins) Alex Bennée
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=20201110192316.26397-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=masami.hiramatsu@linaro.org \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.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 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).