modules: Improve modinfo.c support
cover modules: Improve modinfo.c support
Hello,
This is a RESEND of patch series "[PATCH v3 0/2] modules: Improve modinfo.c support", from Sept 2021.
Message-ID: <[email protected]>
https://lore.kernel.org/qemu-devel/[email protected]/
Jose sent it because we were having issues building QEMU in the way we do that for openSUSE and SUSE Linux Enterprise.
It was, back then, Acked by Gerd (see Message-ID:
[email protected]), but then never picked up. Well, since we are still having those building problems without it, I've rebased and I'm resending it, as agreed with Gerd himself.
"Rebase" was as easy as just reapplying the patches (no offsets, no fuzz). Yet, I removed the ack, assuming that it needs being re-locked at.
make check is happy. The CI, well, it looks fine to me. There's some 'Build' jobs that are taking too much to complete, and hence causing failures in the 'Test' ones, but that seems unrelated to the patches. I'll try to restart them in these days, and see if they manage to finish.
https://gitlab.com/dfaggioli/qemu/-/pipelines/549884208
FWIW, we've also started to use it, as downstream patches, in our packages, on top of various versions of QEMU.
Let me know if there's anything more or different that I should do.
Thanks and Regards
---
Jose R. Ziviani (2):
modules: introduces module_kconfig directive
modules: generates per-target modinfo
hw/display/qxl.c | 1 + hw/display/vhost-user-gpu-pci.c | 1 + hw/display/vhost-user-gpu.c | 1 + hw/display/vhost-user-vga.c | 1 + hw/display/virtio-gpu-base.c | 1 + hw/display/virtio-gpu-gl.c | 1 + hw/display/virtio-gpu-pci-gl.c | 1 + hw/display/virtio-gpu-pci.c | 1 + hw/display/virtio-gpu.c | 1 + hw/display/virtio-vga-gl.c | 1 + hw/display/virtio-vga.c | 1 + hw/s390x/virtio-ccw-gpu.c | 1 + hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + include/qemu/module.h | 10 ++++++++ meson.build | 25 +++++++++++++------- scripts/modinfo-generate.py | 42 ++++++++++++++++++++------------- 19 files changed, 69 insertions(+), 24 deletions(-)
--
Signature
PATCH RESEND 1/2 modules: introduces module_kconfig directive
From: Jose R. Ziviani <[email protected]>
module_kconfig is a new directive that should be used with module_obj whenever that module depends on the Kconfig to be enabled.
When the module is enabled in Kconfig we are sure that its dependencies will be enabled as well, thus the module will be loaded without any problem.
The correct way to use module_kconfig is by passing the Kconfig option to module_kconfig (or the *config-devices.mak without CONFIG_).
---
Cc: Gerd Hoffmann <[email protected]>
Cc: John Snow <[email protected]>
Cc: Cleber Rosa <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: [email protected]
--- hw/display/qxl.c | 1 + hw/display/vhost-user-gpu-pci.c | 1 + hw/display/vhost-user-gpu.c | 1 + hw/display/vhost-user-vga.c | 1 + hw/display/virtio-gpu-base.c | 1 + hw/display/virtio-gpu-gl.c | 1 + hw/display/virtio-gpu-pci-gl.c | 1 + hw/display/virtio-gpu-pci.c | 1 + hw/display/virtio-gpu.c | 1 + hw/display/virtio-vga-gl.c | 1 + hw/display/virtio-vga.c | 1 + hw/s390x/virtio-ccw-gpu.c | 1 + hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + include/qemu/module.h | 10 ++++++++++ scripts/modinfo-generate.py | 2 ++ 18 files changed, 28 insertions(+)
hw/display/qxl.c +1 -0
@@ -2515,6 +2515,7 @@ static const TypeInfo qxl_primary_info = { .class_init = qxl_primary_class_init, };module_obj ("qxl-vga" ); +module_kconfig (QXL );static void qxl_secondary_class_init (ObjectClass *klass,void *data) {
hw/display/vhost-user-gpu-pci.c +1 -0
@@ -44,6 +44,7 @@ static const VirtioPCIDeviceTypeInfo vhost_user_gpu_pci_info = { .instance_init = vhost_user_gpu_pci_initfn, };module_obj (TYPE_VHOST_USER_GPU_PCI ); +module_kconfig (VHOST_USER_GPU );static void vhost_user_gpu_pci_register_types (void ) {
hw/display/vhost-user-gpu.c +1 -0
@@ -606,6 +606,7 @@ static const TypeInfo vhost_user_gpu_info = { .class_init = vhost_user_gpu_class_init, };module_obj (TYPE_VHOST_USER_GPU ); +module_kconfig (VHOST_USER_GPU );static void vhost_user_gpu_register_types (void ) {
hw/display/vhost-user-vga.c +1 -0
@@ -45,6 +45,7 @@ static const VirtioPCIDeviceTypeInfo vhost_user_vga_info = { .instance_init = vhost_user_vga_inst_initfn, };module_obj (TYPE_VHOST_USER_VGA ); +module_kconfig (VHOST_USER_VGA );static void vhost_user_vga_register_types (void ) {
hw/display/virtio-gpu-base.c +1 -0
@@ -260,6 +260,7 @@ static const TypeInfo virtio_gpu_base_info = { .abstract = true };module_obj (TYPE_VIRTIO_GPU_BASE ); +module_kconfig (VIRTIO_GPU );static void virtio_register_types (void )
hw/display/virtio-gpu-gl.c +1 -0
@@ -160,6 +160,7 @@ static const TypeInfo virtio_gpu_gl_info = { .class_init = virtio_gpu_gl_class_init, };module_obj (TYPE_VIRTIO_GPU_GL ); +module_kconfig (VIRTIO_GPU );static void virtio_register_types (void ) {
hw/display/virtio-gpu-pci-gl.c +1 -0
@@ -47,6 +47,7 @@ static const VirtioPCIDeviceTypeInfo virtio_gpu_gl_pci_info = { .instance_init = virtio_gpu_gl_initfn, };module_obj (TYPE_VIRTIO_GPU_GL_PCI ); +module_kconfig (VIRTIO_PCI );static void virtio_gpu_gl_pci_register_types (void ) {
hw/display/virtio-gpu-pci.c +1 -0
@@ -65,6 +65,7 @@ static const TypeInfo virtio_gpu_pci_base_info = { .abstract = true };module_obj (TYPE_VIRTIO_GPU_PCI_BASE ); +module_kconfig (VIRTIO_PCI );#define TYPE_VIRTIO_GPU_PCI "virtio-gpu-pci"typedef struct VirtIOGPUPCI VirtIOGPUPCI ;
hw/display/virtio-gpu.c +1 -0
@@ -1452,6 +1452,7 @@ static const TypeInfo virtio_gpu_info = { .class_init = virtio_gpu_class_init, };module_obj (TYPE_VIRTIO_GPU ); +module_kconfig (VIRTIO_GPU );static void virtio_register_types (void ) {
hw/display/virtio-vga-gl.c +1 -0
@@ -37,6 +37,7 @@ static VirtioPCIDeviceTypeInfo virtio_vga_gl_info = { .instance_init = virtio_vga_gl_inst_initfn, };module_obj (TYPE_VIRTIO_VGA_GL ); +module_kconfig (VIRTIO_VGA );static void virtio_vga_register_types (void ) {
hw/display/virtio-vga.c +1 -0
@@ -231,6 +231,7 @@ static const TypeInfo virtio_vga_base_info = { .abstract = true, };module_obj (TYPE_VIRTIO_VGA_BASE ); +module_kconfig (VIRTIO_VGA );#define TYPE_VIRTIO_VGA "virtio-vga"
hw/s390x/virtio-ccw-gpu.c +1 -0
@@ -69,6 +69,7 @@ static const TypeInfo virtio_ccw_gpu = { .class_init = virtio_ccw_gpu_class_init, };module_obj (TYPE_VIRTIO_GPU_CCW ); +module_kconfig (VIRTIO_CCW );static void virtio_ccw_gpu_register (void ) {
hw/usb/ccid-card-emulated.c +1 -0
@@ -613,6 +613,7 @@ static const TypeInfo emulated_card_info = { .class_init = emulated_class_initfn, };module_obj (TYPE_EMULATED_CCID ); +module_kconfig (USB );static void ccid_card_emulated_register_types (void ) {
hw/usb/ccid-card-passthru.c +1 -0
@@ -415,6 +415,7 @@ static const TypeInfo passthru_card_info = { .class_init = passthru_class_initfn, };module_obj (TYPE_CCID_PASSTHRU ); +module_kconfig (USB );static void ccid_card_passthru_register_types (void ) {
hw/usb/host-libusb.c +1 -0
@@ -1809,6 +1809,7 @@ static const TypeInfo usb_host_dev_info = { .instance_init = usb_host_instance_init, };module_obj (TYPE_USB_HOST_DEVICE ); +module_kconfig (USB );static void usb_host_register_types (void ) {
hw/usb/redirect.c +1 -0
@@ -2620,6 +2620,7 @@ static const TypeInfo usbredir_dev_info = { .instance_init = usbredir_instance_init, };module_obj (TYPE_USB_REDIR ); +module_kconfig (USB );static void usbredir_register_types (void ) {
include/qemu/module.h +10 -0
@@ -135,6 +135,16 @@ void module_allow_arch(const char *arch);*/ #define module_opts (name) modinfo(opts, name) +/** +* module_kconfig +* +* @name: Kconfig requirement necessary to load the module +* +* This module requires a core module that should be implemented and +* enabled in Kconfig. +*/ +#define module_kconfig (name) modinfo(kconfig, name) +/* * module info database *
scripts/modinfo-generate.py +2 -0
@@ -48,6 +48,8 @@ def generate(name, lines): opts.append(data) elif kind == 'arch': arch = data; + elif kind == 'kconfig': + pass # ignore else: print("unknown:", kind) exit(1)
PATCH RESEND 2/2 modules: generates per-target modinfo
In reply to Dario FaggioliFrom: Jose R. Ziviani <[email protected]>
This patch changes the way modinfo is generated and built. Instead of one modinfo.c it generates one modinfo-<target>-softmmu.c per target. It aims a fine-tune control of modules by configuring Kconfig.
---
Cc: Gerd Hoffmann <[email protected]>
Cc: John Snow <[email protected]>
Cc: Cleber Rosa <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: [email protected]
--- meson.build | 25 +++++++++++++++++-------- scripts/modinfo-generate.py | 42 +++++++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 25 deletions(-)
meson.build +17 -8
@@ -3172,14 +3172,23 @@ foreach d, list : target_modules endforeach if enable_modules - modinfo_src = custom_target('modinfo.c', - output: 'modinfo.c', - input: modinfo_files, - command: [modinfo_generate, '@INPUT@'], - capture: true) - modinfo_lib = static_library('modinfo', modinfo_src) - modinfo_dep = declare_dependency(link_whole: modinfo_lib) - softmmu_ss.add(modinfo_dep) + foreach target : target_dirs + if target.endswith('-softmmu') + config_target = config_target_mak[target] + config_devices_mak = target + '-config-devices.mak' + modinfo_src = custom_target('modinfo-' + target + '.c', + output: 'modinfo-' + target + '.c', + input: modinfo_files, + command: [modinfo_generate, '--devices', config_devices_mak, '@INPUT@'], + capture: true) + + modinfo_lib = static_library('modinfo-' + target + '.c', modinfo_src) + modinfo_dep = declare_dependency(link_with: modinfo_lib) + + arch = config_target['TARGET_NAME'] == 'sparc64' ? 'sparc64' : config_target['TARGET_BASE_ARCH'] + hw_arch[arch].add(modinfo_dep) + endif + endforeach endif nm = find_program('nm')
scripts/modinfo-generate.py +25 -17
72 lines not on this page · raw message
Paolo Bonzini
AppliedQueued, thanks.
Paolo