summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-06-24 15:10:42 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-07-07 15:33:59 +0200
commitd39e93d4833a75a86cbb60ca5daf45b299b7c78c (patch)
treeabbe5cacba81079768e01a55e1ba92a7669620ac
parentaa9c8573be01fd7cdf56ff31df3af0307017a258 (diff)
downloadqemu-d39e93d4833a75a86cbb60ca5daf45b299b7c78c.zip
vga: build qxl as module
First step in making spice support modular. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20200624131045.14512-8-kraxel@redhat.com
-rw-r--r--hw/Makefile.objs1
-rw-r--r--hw/display/Makefile.objs5
-rw-r--r--util/module.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index af8fd9a510..14b7ea4eb6 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 77a7d622bd..76b3571e49 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
diff --git a/util/module.c b/util/module.c
index e3226165e9..7c76d2a84b 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;