diff mbox series

[RFC,08/15] meson.build: fix building of Xen support for aarch64

Message ID 20201105175153.30489-9-alex.bennee@linaro.org
State Superseded
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 
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.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

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>
Fixes: 8a19980e3f ("configure: move accelerator logic to meson")
---
 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Nov. 5, 2020, 6:20 p.m. UTC | #1 
On 11/5/20 6:51 PM, Alex Bennée wrote:
> 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.

> 

> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> 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>

> Fixes: 8a19980e3f ("configure: move accelerator logic to meson")

> ---

>  meson.build | 7 ++++++-

>  1 file changed, 6 insertions(+), 1 deletion(-)


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index f5175010df..58e95227ea 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'],
   }