build some devices as modules.
v2 cover build some devices as modules.
Specifically devices which depend on shared libraries, to reduce the runtime dependencies of core qemu.
v2:
- better commit messages.
- add some more devices.
- general tidy up.
Gerd Hoffmann (7):
qdev: add support for device module loading
build: fix device module builds
ccid: build smartcard as module
usb: build usb-redir as module
vga: build qxl as module
vga: build virtio-gpu only once
vga: build virtio-gpu as module
Makefile.objs | 1 + Makefile.target | 7 +++++ include/hw/qdev-core.h | 3 ++ include/qemu/module.h | 1 + hw/core/qdev.c | 61 ++++++++++++++++++++++++++++++++++++++++ qdev-monitor.c | 5 ++++ qom/qom-qmp-cmds.c | 1 + stubs/hw-module.c | 6 ++++ hw/Makefile.objs | 2 ++ hw/display/Makefile.objs | 28 ++++++++++-------- hw/usb/Makefile.objs | 13 ++++++--- stubs/Makefile.objs | 1 + 12 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 stubs/hw-module.c
Signature · 1 line
2.18.4
PATCH v2 1/7 qdev: add support for device module loading
When compiling devices as modules we'll need some infrastrtucture to actually load those modules if needed. This patch adds it.
--- include/hw/qdev-core.h | 3 +++ include/qemu/module.h | 1 + hw/core/qdev.c | 50 ++++++++++++++++++++++++++++++++++++++++++ qdev-monitor.c | 5 +++++ qom/qom-qmp-cmds.c | 1 + stubs/hw-module.c | 6 +++++ stubs/Makefile.objs | 1 + 7 files changed, 67 insertions(+) create mode 100644 stubs/hw-module.c
include/hw/qdev-core.h +3 -0
@@ -552,4 +552,7 @@ void device_listener_unregister(DeviceListener *listener);*/ bool qdev_should_hide_device (QemuOpts *opts); +void qdev_module_load_type (const char *type); +void qdev_module_load_all (void ); +#endif
include/qemu/module.h +1 -0
@@ -64,6 +64,7 @@ typedef enum {#define block_module_load_one (lib) module_load_one("block-", lib)#define ui_module_load_one (lib) module_load_one("ui-", lib)#define audio_module_load_one (lib) module_load_one("audio-", lib) +#define hw_module_load_one (lib) module_load_one("hw-", lib)void register_module_init (void (*fn)(void ),module_init_type type);void register_dso_module_init (void (*fn)(void ),module_init_type type);
hw/core/qdev.c +50 -0
60 lines not on this page · raw message
qdev-monitor.c +5 -0
@@ -147,6 +147,7 @@ static void qdev_print_devinfos(bool show_no_user)int i;bool cat_printed; +qdev_module_load_all (); list =object_class_get_list_sorted (TYPE_DEVICE , false);for (i =0 ; i <=DEVICE_CATEGORY_MAX ; i++) {
@@ -224,6 +225,10 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp) oc =object_class_by_name (*driver); } } +if (!oc) { +qdev_module_load_type (*driver); + oc =object_class_by_name (*driver); + }if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {if (*driver != original_name) {
qom/qom-qmp-cmds.c +1 -0
@@ -116,6 +116,7 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements, {ObjectTypeInfoList *ret =NULL ; +qdev_module_load_all ();object_class_foreach (qom_list_types_tramp, implements, abstract, &ret);return ret;
stubs/hw-module.c new file +6 -0
@@ -0,0 +1,6 @@ +#include "qemu/osdep.h" +#include "hw/qdev-core.h" + +void qdev_module_load_all (void ) +{ +}
stubs/Makefile.objs +1 -0
@@ -44,4 +44,5 @@ stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o stub-obj-y += ramfb.o stub-obj-y += fw_cfg.o +stub-obj-y += hw-module.o stub-obj-$(CONFIG_SOFTMMU) += semihost.o
Signature · 1 line
2.18.4
Re: [PATCH v2 1/7] qdev: add support for device module loading
Quoted 44 lines · Gerd Hoffmann
When compiling devices as modules we'll need some infrastrtucture to actually load those modules if needed. This patch adds it.
Signed-off-by Gerd Hoffmann <[email protected]>---
include/hw/qdev-core.h | 3 +++ include/qemu/module.h | 1 + hw/core/qdev.c | 50 ++++++++++++++++++++++++++++++++++++++++++ qdev-monitor.c | 5 +++++ qom/qom-qmp-cmds.c | 1 + stubs/hw-module.c | 6 +++++ stubs/Makefile.objs | 1 + 7 files changed, 67 insertions(+)create mode 100644
stubs/hw-module.cinclude/hw/qdev-core.h +3
-0@@ -552,4 +552,7 @@ void device_listener_unregister(DeviceListener *listener);*/ bool qdev_should_hide_device (QemuOpts *opts); +void qdev_module_load_type (const char *type); +void qdev_module_load_all (void ); +#endif include/qemu/module.h +1
-0@@ -64,6 +64,7 @@ typedef enum {#define block_module_load_one (lib) module_load_one("block-", lib)#define ui_module_load_one (lib) module_load_one("ui-", lib)#define audio_module_load_one (lib) module_load_one("audio-", lib) +#define hw_module_load_one (lib) module_load_one("hw-", lib)void register_module_init (void (*fn)(void ),module_init_type type);void register_dso_module_init (void (*fn)(void ),module_init_type type);hw/core/qdev.c +0
-0
hw/core/qdev.c DeviceState *qdev_create(BusState *bus, const char *name) · line 152
Quoted 7 lines
hw/core/qdev.c +4
-0@@ -146,10 +146,60 @@ DeviceState *qdev_create(BusState *bus, const char *name)return dev; } +/* +* Building devices modular is mostly useful in case they have +* dependencies to external libraries. Which is the case for very few +* devices. So with the expecration that this will be rather the
Typo: "expectation"
Regards,
BALATON Zoltan
Quoted 111 lines
hw/core/qdev.c +46
-0+* exception than to rule go with a simple hardcoded list for now ... +*/ +static struct { +const char *type; +const char *mod; +}const hwmodules[] = { +}; + +static bool qdev_module_loaded_all; + +void qdev_module_load_type (const char *type) +{ +int i; + +if (qdev_module_loaded_all) { +return ; + } +for (i =0 ; i <ARRAY_SIZE (hwmodules); i++) { +if (strcmp (hwmodules[i].type, type) ==0 ) { +hw_module_load_one (hwmodules[i].mod); +return ; + } + } +} + +void qdev_module_load_all (void ) +{ +int i; + +if (qdev_module_loaded_all) { +return ; + } +for (i =0 ; i <ARRAY_SIZE (hwmodules); i++) { +if (i >0 &&strcmp (hwmodules[i -1 ].mod, + hwmodules[i].mod) ==0 ) { +/* one module implementing multiple devices -> load only once */ +continue ; + } +hw_module_load_one (hwmodules[i].mod); + } + qdev_module_loaded_all = true; +} +DeviceState *qdev_try_create (BusState *bus,const char *type) {DeviceState *dev; +if (object_class_by_name (type) ==NULL ) { +qdev_module_load_type (type); + }if (object_class_by_name (type) ==NULL ) {return NULL ; }qdev-monitor.c +5
-0@@ -147,6 +147,7 @@ static void qdev_print_devinfos(bool show_no_user)int i;bool cat_printed; +qdev_module_load_all (); list =object_class_get_list_sorted (TYPE_DEVICE , false);for (i =0 ; i <=DEVICE_CATEGORY_MAX ; i++) {@@ -224,6 +225,10 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp) oc =object_class_by_name (*driver); } } +if (!oc) { +qdev_module_load_type (*driver); + oc =object_class_by_name (*driver); + }if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {if (*driver != original_name) {qom/qom-qmp-cmds.c +1
-0@@ -116,6 +116,7 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements, {ObjectTypeInfoList *ret =NULL ; +qdev_module_load_all ();object_class_foreach (qom_list_types_tramp, implements, abstract, &ret);return ret;stubs/hw-module.c new file +6
-0@@ -0,0 +1,6 @@ +#include "qemu/osdep.h" +#include "hw/qdev-core.h" + +void qdev_module_load_all (void ) +{ +}stubs/Makefile.objs +0
-0@@ -44,4 +44,5 @@ stub-obj-y += pci-host-piix.ostub-obj-y += ram-block.o
stub-obj-y += ramfb.o
stub-obj-y += fw_cfg.o
+stub-obj-y += hw-module.o
stub-obj-$(CONFIG_SOFTMMU) += semihost.o
PATCH v2 2/7 build: fix device module builds
In reply to Gerd HoffmannSee comment. Feels quite hackish. Better ideas anyone?
--- Makefile.target | 7 +++++++ 1 file changed, 7 insertions(+)
Makefile.target +7 -0
@@ -179,6 +179,13 @@ endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y) all-obj-y := $(obj-y) +# +# common-obj-m has some crap here, probably as side effect from +# filling obj-y. Clear it. Fixes suspious dependency errors when +# building devices as modules. +# +common-obj-m := + include $(SRC_PATH)/Makefile.objs dummy := $(call unnest-vars,.., \ authz-obj-y \
Signature · 1 line
2.18.4
PATCH v2 3/7 ccid: build smartcard as module
In reply to Gerd HoffmannDrops libcacard.so dependency from core qemu.
--- Makefile.objs | 1 + hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/usb/Makefile.objs | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-)
Makefile.objs +1 -0
@@ -59,6 +59,7 @@ common-obj-y += migration/ common-obj-y += audio/ common-obj-m += audio/ common-obj-y += hw/ +common-obj-m += hw/ common-obj-y += replay/
hw/core/qdev.c +2 -0
@@ -156,6 +156,8 @@ static struct {const char *type;const char *mod; } const hwmodules[] = { + { .type ="ccid-card-passthru" , .mod ="usb-smartcard" }, + { .type ="ccid-card-emulated" , .mod ="usb-smartcard" }, };static bool qdev_module_loaded_all;
hw/Makefile.objs +1 -0
@@ -43,4 +43,5 @@ devices-dirs-y += smbios/ endif common-obj-y += $(devices-dirs-y) +common-obj-m += usb/ obj-y += $(devices-dirs-y)
hw/usb/Makefile.objs +3 -1
@@ -28,11 +28,13 @@ common-obj-$(CONFIG_USB_NETWORK) += dev-network.o ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y += dev-smartcard-reader.o -common-obj-$(CONFIG_SMARTCARD) += smartcard.mo +ifeq ($(CONFIG_SMARTCARD),y) +common-obj-m += smartcard.mo smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o smartcard.mo-cflags := $(SMARTCARD_CFLAGS) smartcard.mo-libs := $(SMARTCARD_LIBS) endif +endif ifeq ($(CONFIG_POSIX),y) common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o
Signature · 1 line
2.18.4
PATCH v2 4/7 usb: build usb-redir as module
In reply to Gerd HoffmannDrops libusbredirparser.so dependency from core qemu.
--- hw/core/qdev.c | 1 + hw/usb/Makefile.objs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)
hw/core/qdev.c +1 -0
@@ -158,6 +158,7 @@ static struct { } const hwmodules[] = { { .type ="ccid-card-passthru" , .mod ="usb-smartcard" }, { .type ="ccid-card-emulated" , .mod ="usb-smartcard" }, + { .type ="usb-redir" , .mod ="usb-redirect" }, };static bool qdev_module_loaded_all;
hw/usb/Makefile.objs +6 -3
@@ -42,9 +42,12 @@ endif # usb redirection ifeq ($(CONFIG_USB),y) -common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o -redirect.o-cflags = $(USB_REDIR_CFLAGS) -redirect.o-libs = $(USB_REDIR_LIBS) +ifeq ($(CONFIG_USB-REDIR),y) +common-obj-m += redirect.mo +redirect.mo-objs = redirect.o quirks.o +redirect.mo-cflags = $(USB_REDIR_CFLAGS) +redirect.mo-libs = $(USB_REDIR_LIBS) +endif endif # usb pass-through
Signature · 1 line
2.18.4
PATCH v2 5/7 vga: build qxl as module
In reply to Gerd HoffmannFirst step in making spice support modular.
--- hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-)
hw/core/qdev.c +2 -0
@@ -159,6 +159,8 @@ static struct { { .type = "ccid-card-passthru", .mod = "usb-smartcard" }, { .type = "ccid-card-emulated", .mod = "usb-smartcard" }, { .type = "usb-redir", .mod = "usb-redirect" }, + { .type = "qxl-vga", .mod = "display-qxl" }, + { .type = "qxl", .mod = "display-qxl" }, };static bool qdev_module_loaded_all;
hw/Makefile.objs +1 -0
@@ -43,5 +43,6 @@ devices-dirs-y += smbios/ endif common-obj-y += $(devices-dirs-y) +common-obj-m += display/ common-obj-m += usb/ obj-y += $(devices-dirs-y)
hw/display/Makefile.objs +4 -1
@@ -44,7 +44,10 @@ common-obj-$(CONFIG_ARTIST) += artist.o obj-$(CONFIG_VGA) += vga.o -common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o +ifeq ($(CONFIG_QXL),y) +common-obj-m += qxl.mo +qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o +endif obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o
Signature · 1 line
2.18.4
PATCH v2 6/7 vga: build virtio-gpu only once
In reply to Gerd Hoffmann--- hw/display/Makefile.objs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/display/Makefile.objs +6 -6
@@ -49,12 +49,12 @@ common-obj-m += qxl.mo qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o endif -obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o -obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o -obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o -obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o -obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o -obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o +common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o +common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o +common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o +common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o +common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o +common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o virtio-gpu.o-cflags := $(VIRGL_CFLAGS) virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS)
Signature · 1 line
2.18.4
Re: [PATCH v2 6/7] vga: build virtio-gpu only once
Quoted 19 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- hw/display/Makefile.objs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)hw/display/Makefile.objs +0
-5@@ -49,12 +49,12 @@ common-obj-m += qxl.mo qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o endif -obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o -obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o -obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o -obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o -obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o
hw/display/Makefile.objs common-obj-m += qxl.mo · line 60
Quoted 10 lines
hw/display/Makefile.objs +6
-1-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o +common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o +common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o +common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o +common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o +common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o +common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o virtio-gpu.o-cflags := $(VIRGL_CFLAGS) virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS)
PATCH v2 7/7 vga: build virtio-gpu as module
In reply to Gerd HoffmannDrops libvirglrenderer.so dependency from core qemu.
--- hw/core/qdev.c | 6 ++++++ hw/display/Makefile.objs | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-)
hw/core/qdev.c +6 -0
@@ -161,6 +161,12 @@ static struct { { .type = "usb-redir", .mod = "usb-redirect" }, { .type = "qxl-vga", .mod = "display-qxl" }, { .type = "qxl", .mod = "display-qxl" }, + { .type = "virtio-gpu-device", .mod = "display-virtio-gpu" }, + { .type = "virtio-gpu-pci", .mod = "display-virtio-gpu" }, + { .type = "virtio-vga", .mod = "display-virtio-gpu" }, + { .type = "vhost-user-gpu-device", .mod = "display-virtio-gpu" }, + { .type = "vhost-user-gpu-pci", .mod = "display-virtio-gpu" }, + { .type = "vhost-user-vga", .mod = "display-virtio-gpu" }, };static bool qdev_module_loaded_all;
hw/display/Makefile.objs +13 -10
@@ -49,16 +49,19 @@ common-obj-m += qxl.mo qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o endif -common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o -common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o -common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o -common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o -common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o -common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o -virtio-gpu.o-cflags := $(VIRGL_CFLAGS) -virtio-gpu.o-libs += $(VIRGL_LIBS) -virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) -virtio-gpu-3d.o-libs += $(VIRGL_LIBS) +ifeq ($(CONFIG_VIRTIO_GPU),y) +common-obj-m += virtio-gpu.mo +virtio-gpu-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o +virtio-gpu-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o +virtio-gpu-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o +virtio-gpu-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o +virtio-gpu-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o +virtio-gpu-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o +virtio-gpu.mo-objs := $(virtio-gpu-obj-y) +virtio-gpu.mo-cflags := $(VIRGL_CFLAGS) +virtio-gpu.mo-libs := $(VIRGL_LIBS) +endif + common-obj-$(CONFIG_DPCD) += dpcd.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o
Signature · 1 line
2.18.4