[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 07/15] accel/meson: you only need accelerator stubs for softm
From: |
Alex Bennée |
Subject: |
[RFC PATCH 07/15] accel/meson: you only need accelerator stubs for softmmu builds |
Date: |
Thu, 5 Nov 2020 17:51:45 +0000 |
This avoids us pulling in Xen headers we don't need. The TCG
accelerator will always exist for the *-user builds.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
accel/meson.build | 4 +++-
accel/stubs/meson.build | 12 ++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/accel/meson.build b/accel/meson.build
index b26cca227a..c4936698cd 100644
--- a/accel/meson.build
+++ b/accel/meson.build
@@ -4,7 +4,9 @@ subdir('qtest')
subdir('kvm')
subdir('tcg')
subdir('xen')
-subdir('stubs')
+if have_system
+ subdir('stubs')
+endif
dummy_ss = ss.source_set()
dummy_ss.add(files(
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
index 12dd1539af..d65cb6a5e1 100644
--- a/accel/stubs/meson.build
+++ b/accel/stubs/meson.build
@@ -1,4 +1,8 @@
-specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c'))
-specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
-specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
-specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
+softmmu_stub_ss = ss.source_set()
+
+softmmu_stub_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c'))
+softmmu_stub_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
+softmmu_stub_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
+softmmu_stub_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
+
+specific_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: softmmu_stub_ss)
--
2.20.1
- Re: [RFC PATCH 02/15] hw/riscv: migrate fdt field to generic MachineState, (continued)
[RFC PATCH 05/15] docs: move generic-loader documentation into the main manual, Alex Bennée, 2020/11/05
[RFC PATCH 08/15] meson.build: fix building of Xen support for aarch64, Alex Bennée, 2020/11/05
[RFC PATCH 10/15] meson.build: clean-up summary reporting of XEN and it's features, Alex Bennée, 2020/11/05
[RFC PATCH 09/15] meson.build: introduce CONFIG_XEN_HVM flag, Alex Bennée, 2020/11/05
[RFC PATCH 07/15] accel/meson: you only need accelerator stubs for softmmu builds,
Alex Bennée <=
[RFC PATCH 12/15] stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub, Alex Bennée, 2020/11/05
[RFC PATCH 14/15] xen: only build HVM support under CONFIG_XEN_HVM, Alex Bennée, 2020/11/05
[RFC PATCH 13/15] accel/stubs: drop unused cpu.h include, Alex Bennée, 2020/11/05
[RFC PATCH 15/15] meson.build: build a Xen aware qemu-aarch64-system, Alex Bennée, 2020/11/05
[RFC PATCH 11/15] include/hw/xen.h: drop superfluous struct, Alex Bennée, 2020/11/05