summaryrefslogtreecommitdiffstats
path: root/stubs
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2021-08-23 12:04:53 +0200
committerGerd Hoffmann2021-08-31 14:31:43 +0200
commitcdb1fba0844bb1db71f67d35700a80838d185bbd (patch)
tree38488176ad5eb2bde9bce5f3609db14f972ee9e0 /stubs
parentvirtio-gpu: no point of checking res->iov (diff)
downloadqemu-cdb1fba0844bb1db71f67d35700a80838d185bbd.tar.gz
qemu-cdb1fba0844bb1db71f67d35700a80838d185bbd.tar.xz
qemu-cdb1fba0844bb1db71f67d35700a80838d185bbd.zip
hw/display: Restrict virtio-gpu-udmabuf stubs to !Linux
When using qemu configured with --enabled-modules, the generic stubs are used instead of the module symbols: qemu-system-x86_64: -device virtio-vga,blob=on: cannot enable blob resources without udmabuf Restrict the stubs to Linux and only link them when CONFIG_VIRTIO_GPU is disabled (only the modularized version is available when it is enabled). Reported-by: Maxim R. <mrom06@ya.ru> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/553 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210823100454.615816-2-philmd@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'stubs')
-rw-r--r--stubs/meson.build1
-rw-r--r--stubs/virtio-gpu-udmabuf.c27
2 files changed, 0 insertions, 28 deletions
diff --git a/stubs/meson.build b/stubs/meson.build
index 717bfa9a99..275ac89c16 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -52,7 +52,6 @@ if have_system
stub_ss.add(files('semihost.c'))
stub_ss.add(files('usb-dev-stub.c'))
stub_ss.add(files('xen-hw-stub.c'))
- stub_ss.add(files('virtio-gpu-udmabuf.c'))
else
stub_ss.add(files('qdev.c'))
endif
diff --git a/stubs/virtio-gpu-udmabuf.c b/stubs/virtio-gpu-udmabuf.c
deleted file mode 100644
index 81f661441a..0000000000
--- a/stubs/virtio-gpu-udmabuf.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "qemu/osdep.h"
-#include "hw/virtio/virtio-gpu.h"
-
-bool virtio_gpu_have_udmabuf(void)
-{
- /* nothing (stub) */
- return false;
-}
-
-void virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res)
-{
- /* nothing (stub) */
-}
-
-void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res)
-{
- /* nothing (stub) */
-}
-
-int virtio_gpu_update_dmabuf(VirtIOGPU *g,
- uint32_t scanout_id,
- struct virtio_gpu_simple_resource *res,
- struct virtio_gpu_framebuffer *fb)
-{
- /* nothing (stub) */
- return 0;
-}