[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] meson: introduce modules_arch
From: |
Jose R. Ziviani |
Subject: |
[PATCH 1/2] meson: introduce modules_arch |
Date: |
Thu, 16 Sep 2021 22:29:03 -0300 |
This variable keeps track of all modules enabled for a target
architecture. This will be used in modinfo to refine the
architectures that can really load the .so to avoid errors.
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
---
hw/display/meson.build | 48 ++++++++++++++++++++++++++++++++++++++++++
hw/usb/meson.build | 36 +++++++++++++++++++++++++++++++
meson.build | 1 +
3 files changed, 85 insertions(+)
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 861c43ff98..ba06f58ff1 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -43,6 +43,18 @@ if config_all_devices.has_key('CONFIG_QXL')
qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c',
'qxl-render.c'),
pixman, spice])
hw_display_modules += {'qxl': qxl_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_QXL') and cfg_target['CONFIG_QXL'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'qxl': archs}
endif
softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
@@ -65,6 +77,18 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
virtio_gpu_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', virgl, opengl],
if_true: [files('virtio-gpu-gl.c',
'virtio-gpu-virgl.c'), pixman, virgl])
hw_display_modules += {'virtio-gpu-gl': virtio_gpu_gl_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_VIRTIO_GPU') and
cfg_target['CONFIG_VIRTIO_GPU'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'virtio-gpu': archs, 'virtio-gpu-gl': archs}
endif
if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
@@ -79,6 +103,18 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
virtio_gpu_pci_gl_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI',
virgl, opengl],
if_true: [files('virtio-gpu-pci-gl.c'), pixman])
hw_display_modules += {'virtio-gpu-pci-gl': virtio_gpu_pci_gl_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_VIRTIO_PCI') and
cfg_target['CONFIG_VIRTIO_PCI'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'virtio-gpu-pci': archs, 'virtio-gpu-pci-gl': archs}
endif
if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
@@ -93,6 +129,18 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl],
if_true: [files('virtio-vga-gl.c'), pixman])
hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_VIRTIO_VGA') and
cfg_target['CONFIG_VIRTIO_VGA'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'virtio-vga': archs, 'virtio-vga-gl': archs}
endif
specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index de853d780d..6b889d2ee2 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -54,6 +54,18 @@ if cacard.found()
usbsmartcard_ss.add(when: 'CONFIG_USB_SMARTCARD',
if_true: [cacard, files('ccid-card-emulated.c',
'ccid-card-passthru.c')])
hw_usb_modules += {'smartcard': usbsmartcard_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_USB_SMARTCARD') and
cfg_target['CONFIG_USB_SMARTCARD'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'smartcard': archs}
endif
# U2F
@@ -69,6 +81,18 @@ if usbredir.found()
usbredir_ss.add(when: 'CONFIG_USB',
if_true: [usbredir, files('redirect.c', 'quirks.c')])
hw_usb_modules += {'redirect': usbredir_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_USB') and cfg_target['CONFIG_USB'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'redirect': archs}
endif
# usb pass-through
@@ -77,6 +101,18 @@ if libusb.found()
usbhost_ss.add(when: ['CONFIG_USB', libusb],
if_true: files('host-libusb.c'))
hw_usb_modules += {'host': usbhost_ss}
+
+ archs = []
+ foreach target: target_dirs
+ if target.endswith('-softmmu')
+ cfg_target = config_target_mak[target]
+ if cfg_target.has_key('CONFIG_USB') and cfg_target['CONFIG_USB'] == 'y'
+ archs += [cfg_target['TARGET_NAME']]
+ endif
+ endif
+ endforeach
+
+ modules_arch += {'host': archs}
endif
softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true:
files('xen-usb.c'))
diff --git a/meson.build b/meson.build
index 2711cbb789..d1d3fd84ec 100644
--- a/meson.build
+++ b/meson.build
@@ -2071,6 +2071,7 @@ tcg_module_ss = ss.source_set()
modules = {}
target_modules = {}
+modules_arch = {}
hw_arch = {}
target_arch = {}
target_softmmu_arch = {}
--
2.33.0
- [PATCH 0/2] modules: Improve modinfo.c architecture support, Jose R. Ziviani, 2021/09/16
- [PATCH 1/2] meson: introduce modules_arch,
Jose R. Ziviani <=
- Re: [PATCH 1/2] meson: introduce modules_arch, Gerd Hoffmann, 2021/09/17
- Re: [PATCH 1/2] meson: introduce modules_arch, Jose R. Ziviani, 2021/09/17
- Re: [PATCH 1/2] meson: introduce modules_arch, Gerd Hoffmann, 2021/09/20
- Re: [PATCH 1/2] meson: introduce modules_arch, Jose R. Ziviani, 2021/09/20
- Re: [PATCH 1/2] meson: introduce modules_arch, Paolo Bonzini, 2021/09/20
- Re: [PATCH 1/2] meson: introduce modules_arch, Jose R. Ziviani, 2021/09/21
- Re: [PATCH 1/2] meson: introduce modules_arch, Paolo Bonzini, 2021/09/23
- Re: [PATCH 1/2] meson: introduce modules_arch, Gerd Hoffmann, 2021/09/21
- Re: [PATCH 1/2] meson: introduce modules_arch, Jose R. Ziviani, 2021/09/21
- Re: [PATCH 1/2] meson: introduce modules_arch, Gerd Hoffmann, 2021/09/21