[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-9.0 v2 19/19] hw/xen: Have most of Xen files become target-ag
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-9.0 v2 19/19] hw/xen: Have most of Xen files become target-agnostic |
Date: |
Tue, 14 Nov 2023 15:38:15 +0100 |
Previous commits re-organized the target-specific bits
from Xen files. We can now build the common files once
instead of per-target.
Only 4 files call libxen API (thus its CPPFLAGS):
- xen-hvm-common.c,
- xen_pt.c, xen_pt_graphics.c, xen_pt_msi.c
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Reworked since v1 so dropping David's R-b tag.
---
accel/xen/meson.build | 2 +-
hw/block/dataplane/meson.build | 2 +-
hw/xen/meson.build | 21 ++++++++++-----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/accel/xen/meson.build b/accel/xen/meson.build
index 002bdb03c6..455ad5d6be 100644
--- a/accel/xen/meson.build
+++ b/accel/xen/meson.build
@@ -1 +1 @@
-specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c'))
+system_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c'))
diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build
index 025b3b061b..4d8bcb0bb9 100644
--- a/hw/block/dataplane/meson.build
+++ b/hw/block/dataplane/meson.build
@@ -1,2 +1,2 @@
system_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
-specific_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
+system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index d887fa9ba4..403cab49cf 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -7,26 +7,25 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
'xen_pvdev.c',
))
-system_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+system_ss.add(when: ['CONFIG_XEN'], if_true: files(
'xen-operations.c',
-))
-
-xen_specific_ss = ss.source_set()
-xen_specific_ss.add(files(
'xen-mapcache.c',
+))
+system_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
'xen-hvm-common.c',
))
+
if have_xen_pci_passthrough
- xen_specific_ss.add(files(
+ system_ss.add(when: ['CONFIG_XEN'], if_true: files(
'xen-host-pci-device.c',
- 'xen_pt.c',
'xen_pt_config_init.c',
- 'xen_pt_graphics.c',
'xen_pt_load_rom.c',
+ ))
+ system_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+ 'xen_pt.c',
+ 'xen_pt_graphics.c',
'xen_pt_msi.c',
))
else
- xen_specific_ss.add(files('xen_pt_stub.c'))
+ system_ss.add(when: ['CONFIG_XEN'], if_true: files('xen_pt_stub.c'))
endif
-
-specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
--
2.41.0
- [PATCH-for-9.0 v2 11/19] hw/xen/xen_arch_hvm: Rename prototypes using 'xen_arch_' prefix, (continued)
- [PATCH-for-9.0 v2 11/19] hw/xen/xen_arch_hvm: Rename prototypes using 'xen_arch_' prefix, Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 15/19] hw/xen: Reduce inclusion of 'cpu.h' to target-specific sources, Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 12/19] hw/xen: Merge 'hw/xen/arch_hvm.h' in 'hw/xen/xen-hvm-common.h', Philippe Mathieu-Daudé, 2023/11/14
- [RFC PATCH-for-9.0 v2 13/19] hw/xen: Remove use of 'target_ulong' in handle_ioreq(), Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 14/19] hw/xen: Use target-agnostic qemu_target_page_bits(), Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 16/19] hw/xen/xen_pt: Add missing license, Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 17/19] hw/xen: Extract 'xen_igd.h' from 'xen_pt.h', Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 18/19] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS, Philippe Mathieu-Daudé, 2023/11/14
- [PATCH-for-9.0 v2 19/19] hw/xen: Have most of Xen files become target-agnostic,
Philippe Mathieu-Daudé <=