diff mbox series

[RFC,15/15] meson.build: build a Xen aware qemu-aarch64-system

Message ID 20201105175153.30489-16-alex.bennee@linaro.org
State New
Headers show
Series Xen guest-loader and arm64 build fixes/enhancements | expand

Commit Message

Alex Bennée Nov. 5, 2020, 5:51 p.m. UTC 
The i386-softmmu is a bit of an oddity for running ARM Xen guests so
lets allow us to build an aarch64 binary with a reasonable name as
well.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 meson.build | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 79b74fbda7..5280cd9e8f 100644
--- a/meson.build
+++ b/meson.build
@@ -74,15 +74,16 @@  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
+if cpu in ['arm', 'aarch64']
+  # i386 emulator used to provide xenpv machine type for all
+  # supported architectures
   accelerator_targets += {
-    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
+    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'arm-softmmu', 'aarch64-softmmu'],
   }
-endif
-if cpu in ['x86', 'x86_64']
+elif cpu in ['x86', 'x86_64']
   accelerator_targets += {
     'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'],
+    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
     'CONFIG_XEN_HVM': ['i386-softmmu', 'x86_64-softmmu'],
     'CONFIG_HVF': ['x86_64-softmmu'],
     'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'],