* [PATCH 0/2] module fixes
@ 2020-07-10 20:36 Gerd Hoffmann
2020-07-10 20:36 ` [PATCH 1/2] tests: fix "make check-qtest" for modular builds Gerd Hoffmann
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2020-07-10 20:36 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Peter Maydell, Thomas Huth, Gerd Hoffmann,
Paolo Bonzini, Philippe Mathieu-Daudé
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(-)
--
2.18.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] tests: fix "make check-qtest" for modular builds 2020-07-10 20:36 [PATCH 0/2] module fixes Gerd Hoffmann @ 2020-07-10 20:36 ` Gerd Hoffmann 2020-07-13 5:36 ` Thomas Huth 2020-07-10 20:36 ` [PATCH 2/2] Revert "vga: build virtio-gpu as module" Gerd Hoffmann 2020-07-11 8:51 ` [PATCH 0/2] module fixes Alex Bennée 2 siblings, 1 reply; 6+ messages in thread From: Gerd Hoffmann @ 2020-07-10 20:36 UTC (permalink / raw) To: qemu-devel Cc: Laurent Vivier, Peter Maydell, Thomas Huth, Gerd Hoffmann, Paolo Bonzini, Philippe Mathieu-Daudé Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/Makefile.include | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index 98af2c2d9338..6a0276fd42dd 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -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 -- 2.18.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] tests: fix "make check-qtest" for modular builds 2020-07-10 20:36 ` [PATCH 1/2] tests: fix "make check-qtest" for modular builds Gerd Hoffmann @ 2020-07-13 5:36 ` Thomas Huth 2020-07-13 6:38 ` Gerd Hoffmann 0 siblings, 1 reply; 6+ messages in thread From: Thomas Huth @ 2020-07-13 5:36 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel Cc: Laurent Vivier, Paolo Bonzini, Philippe Mathieu-Daudé, Peter Maydell On 10/07/2020 22.36, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/Makefile.include | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include > index 98af2c2d9338..6a0276fd42dd 100644 > --- a/tests/qtest/Makefile.include > +++ b/tests/qtest/Makefile.include > @@ -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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] tests: fix "make check-qtest" for modular builds 2020-07-13 5:36 ` Thomas Huth @ 2020-07-13 6:38 ` Gerd Hoffmann 0 siblings, 0 replies; 6+ messages in thread From: Gerd Hoffmann @ 2020-07-13 6:38 UTC (permalink / raw) To: Thomas Huth Cc: Laurent Vivier, Paolo Bonzini, Philippe Mathieu-Daudé, qemu-devel, Peter Maydell On Mon, Jul 13, 2020 at 07:36:20AM +0200, Thomas Huth wrote: > On 10/07/2020 22.36, Gerd Hoffmann wrote: > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > tests/qtest/Makefile.include | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include > > index 98af2c2d9338..6a0276fd42dd 100644 > > --- a/tests/qtest/Makefile.include > > +++ b/tests/qtest/Makefile.include > > @@ -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? 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] Revert "vga: build virtio-gpu as module" 2020-07-10 20:36 [PATCH 0/2] module fixes Gerd Hoffmann 2020-07-10 20:36 ` [PATCH 1/2] tests: fix "make check-qtest" for modular builds Gerd Hoffmann @ 2020-07-10 20:36 ` Gerd Hoffmann 2020-07-11 8:51 ` [PATCH 0/2] module fixes Alex Bennée 2 siblings, 0 replies; 6+ messages in thread From: Gerd Hoffmann @ 2020-07-10 20:36 UTC (permalink / raw) To: qemu-devel Cc: Laurent Vivier, Peter Maydell, Thomas Huth, Gerd Hoffmann, Paolo Bonzini, Philippe Mathieu-Daudé 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> --- util/module.c | 6 ------ hw/display/Makefile.objs | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/util/module.c b/util/module.c index 32b0547b8266..90e9bd42c6c7 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 e907f3182b0c..d619594ad4d3 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.18.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] module fixes 2020-07-10 20:36 [PATCH 0/2] module fixes Gerd Hoffmann 2020-07-10 20:36 ` [PATCH 1/2] tests: fix "make check-qtest" for modular builds Gerd Hoffmann 2020-07-10 20:36 ` [PATCH 2/2] Revert "vga: build virtio-gpu as module" Gerd Hoffmann @ 2020-07-11 8:51 ` Alex Bennée 2 siblings, 0 replies; 6+ messages in thread From: Alex Bennée @ 2020-07-11 8:51 UTC (permalink / raw) To: Gerd Hoffmann Cc: Laurent Vivier, Peter Maydell, Thomas Huth, qemu-devel, Paolo Bonzini, Philippe Mathieu-Daudé Gerd Hoffmann <kraxel@redhat.com> writes: > 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. > > util/module.c | 6 ------ > hw/display/Makefile.objs | 23 ++++++++++------------- > tests/qtest/Makefile.include | 1 + > 3 files changed, 11 insertions(+), 19 deletions(-) -- Alex Bennée ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-13 6:40 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-07-10 20:36 [PATCH 0/2] module fixes Gerd Hoffmann 2020-07-10 20:36 ` [PATCH 1/2] tests: fix "make check-qtest" for modular builds Gerd Hoffmann 2020-07-13 5:36 ` Thomas Huth 2020-07-13 6:38 ` Gerd Hoffmann 2020-07-10 20:36 ` [PATCH 2/2] Revert "vga: build virtio-gpu as module" Gerd Hoffmann 2020-07-11 8:51 ` [PATCH 0/2] module fixes Alex Bennée
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).