module fixes
cover module fixes
Gerd Hoffmann (2):
tests: fix "make check-qtest" for modular builds Revert "vga: build virtio-gpu as module"
util/module.c | 6 ------ hw/display/Makefile.objs | 23 ++++++++++------------- tests/qtest/Makefile.include | 1 + 3 files changed, 11 insertions(+), 19 deletions(-)
Signature · 1 line
2.18.4
PATCH 1/2 tests: fix "make check-qtest" for modular builds
--- tests/qtest/Makefile.include | 1 + 1 file changed, 1 insertion(+)
tests/qtest/Makefile.include +1 -0
@@ -277,6 +277,7 @@ tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
Signature · 1 line
2.18.4
Re: [PATCH 1/2] tests: fix "make check-qtest" for modular builds
Quoted 10 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- tests/qtest/Makefile.include | 1 + 1 file changed, 1 insertion(+)tests/qtest/Makefile.include +0
-0
tests/qtest/Makefile.include tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) · line 283
Quoted 7 lines
tests/qtest/Makefile.include +1
-0@@ -277,6 +277,7 @@ tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o
What was the error that you run into here? ... some words in the commit message would be nice. Actually, I always wondered why we need a separate entry for each and every test here ... I'd rather expect that this is handled by a normal generic make rule instead?
Thomas
Re: [PATCH 1/2] tests: fix "make check-qtest" for modular builds
Quoted 15 lines · Thomas Huth
Quoted 14 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- tests/qtest/Makefile.include | 1 + 1 file changed, 1 insertion(+)tests/qtest/Makefile.include +1
-0@@ -277,6 +277,7 @@ tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o
Quoted 8 lines
tests/qtest/Makefile.include tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $(libqos-pc-obj-y) · line 283
Quoted 3 lines
tests/qtest/Makefile.include +0
-0tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.oWhat was the error that you run into here? ... some words in the commit message would be nice. Actually, I always wondered why we need a separate entry for each and every test here ... I'd rather expect that this is handled by a normal generic make rule instead?
With this line the build is done in two steps:
gcc -o test.o test.c
gcc -o test test.o -llib
Without this line the build is done in one step:
gcc -o test test.c -llib
The later seems to not pick up all cflags needed, I got build errors due to an include file not being found (out-of-tree build).
take care,
Gerd
PATCH 2/2 Revert "vga: build virtio-gpu as module"
In reply to Gerd HoffmannThis 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 ...
--- util/module.c | 6 ------ hw/display/Makefile.objs | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-)
util/module.c +0 -6
@@ -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" }, };
hw/display/Makefile.objs +10 -13
@@ -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
Signature · 1 line
2.18.4
Quoted 3 lines · Gerd Hoffmann
Gerd Hoffmann (2):
tests: fix "make check-qtest" for modular builds Revert "vga: build virtio-gpu as module"
Queued to pr/100720-testing-and-misc-2, thanks.
Quoted 5 lines
util/module.c | 6 ------ hw/display/Makefile.objs | 23 ++++++++++------------- tests/qtest/Makefile.include | 1 + 3 files changed, 11 insertions(+), 19 deletions(-)
Signature · 1 line
Alex Bennée