[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 49/50] Revert "vga: build virtio-gpu as module"
From: |
Alex Bennée |
Subject: |
[PULL v2 49/50] Revert "vga: build virtio-gpu as module" |
Date: |
Sat, 11 Jul 2020 18:07:31 +0100 |
From: Gerd Hoffmann <kraxel@redhat.com>
This reverts commit 8d5a24c83dba90b08ef163bbf166d6dfbad9019b.
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>
diff --git a/util/module.c b/util/module.c
index 32b0547b82..90e9bd42c6 100644
--- a/util/module.c
+++ b/util/module.c
@@ -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" },
};
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index e907f3182b..d619594ad4 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -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
--
2.20.1
- [PULL v2 00/50] testing updates (vm, gitlab, misc build fixes), Alex Bennée, 2020/07/11
- [PULL v2 04/50] tests/vm: Add configuration to basevm.py, Alex Bennée, 2020/07/11
- [PULL v2 42/50] docs/devel: convert and update MTTCG design document, Alex Bennée, 2020/07/11
- [PULL v2 43/50] docs/devel: add some notes on tcg-icount for developers, Alex Bennée, 2020/07/11
- [PULL v2 44/50] docs: Add to gdbstub documentation the PhyMemMode, Alex Bennée, 2020/07/11
- [PULL v2 45/50] tests/docker: fall back more gracefully when pull fails, Alex Bennée, 2020/07/11
- [PULL v2 46/50] tests/docker: update toolchain set in debian-xtensa-cross, Alex Bennée, 2020/07/11
- [PULL v2 47/50] .cirrus.yml: add bash to the brew packages, Alex Bennée, 2020/07/11
- [PULL v2 48/50] tests: fix "make check-qtest" for modular builds, Alex Bennée, 2020/07/11
- [PULL v2 49/50] Revert "vga: build virtio-gpu as module",
Alex Bennée <=
- [PULL v2 50/50] iotests: Set LC_ALL=C for sort, Alex Bennée, 2020/07/11
- Re: [PULL v2 00/50] testing updates (vm, gitlab, misc build fixes), Peter Maydell, 2020/07/13