| Message ID | 20200624131045.14512-8-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | build some devices as modules. | expand |
On 2020-06-24 at 15:10 CEST, Gerd Hoffmann wrote... > First step in making spice support modular. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > util/module.c | 2 ++ > hw/Makefile.objs | 1 + > hw/display/Makefile.objs | 5 ++++- > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/util/module.c b/util/module.c > index e3226165e91c..7c76d2a84b94 100644 > --- a/util/module.c > +++ b/util/module.c > @@ -264,6 +264,8 @@ static struct { > { "ccid-card-passthru", "hw-", "usb-smartcard" }, > { "ccid-card-emulated", "hw-", "usb-smartcard" }, > { "usb-redir", "hw-", "usb-redirect" }, > + { "qxl-vga", "hw-", "display-qxl" }, > + { "qxl", "hw-", "display-qxl" }, > }; > > static bool module_loaded_qom_all; > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index af8fd9a510ed..14b7ea4eb62e 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -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) > diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs > index 77a7d622bd2d..76b3571e4902 100644 > --- a/hw/display/Makefile.objs > +++ b/hw/display/Makefile.objs > @@ -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 Reviewed-by: Christophe de Dinechin <dinechin@redhat.com> -- Cheers, Christophe de Dinechin (IRC c3d)
diff --git a/util/module.c b/util/module.c index e3226165e91c..7c76d2a84b94 100644 --- a/util/module.c +++ b/util/module.c @@ -264,6 +264,8 @@ static struct { { "ccid-card-passthru", "hw-", "usb-smartcard" }, { "ccid-card-emulated", "hw-", "usb-smartcard" }, { "usb-redir", "hw-", "usb-redirect" }, + { "qxl-vga", "hw-", "display-qxl" }, + { "qxl", "hw-", "display-qxl" }, }; static bool module_loaded_qom_all; diff --git a/hw/Makefile.objs b/hw/Makefile.objs index af8fd9a510ed..14b7ea4eb62e 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -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) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 77a7d622bd2d..76b3571e4902 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -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
First step in making spice support modular. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- util/module.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-)