OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "vga: build virtio-gpu as module" 

This reverts commit 8d5a24c83d.

Compiling all virtio-gpu objects into a single module isn't a good plan
because the individual objects have different CONFIG_* dependencies.
Leads to module load failures on s390x due to vga support being
disabled, which in turn breaks '-device virtio-gpu-device' (flagged by
travis ci).

So back to the drawing board for modular virtio-gpu ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200710203652.9708-3-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2020-07-10 22:36:52 +02:00 committed by Alex Bennée
parent 024ce1ef7c
commit e94f068720
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/display/Makefile.objs
View File

@ -49,19 +49,16 @@ common-obj-m += qxl.mo
qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o
endif
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_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)
common-obj-$(CONFIG_DPCD) += dpcd.o
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o

6
util/module.c
View File

@ -266,12 +266,6 @@ static struct {
{ "usb-redir", "hw-", "usb-redirect" },
{ "qxl-vga", "hw-", "display-qxl" },
{ "qxl", "hw-", "display-qxl" },
{ "virtio-gpu-device", "hw-", "display-virtio-gpu" },
{ "virtio-gpu-pci", "hw-", "display-virtio-gpu" },
{ "virtio-vga", "hw-", "display-virtio-gpu" },
{ "vhost-user-gpu-device", "hw-", "display-virtio-gpu" },
{ "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" },
{ "vhost-user-vga", "hw-", "display-virtio-gpu" },
{ "chardev-braille", "chardev-", "baum" },
};