diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 20:32:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 20:32:56 +0000 |
| commit | 2ab6c494339652e69ec405dc779d83c46c8faf98 (patch) | |
| tree | 90f273aa9c284113945b76552164a3631674feb7 /hw/display/virtio-gpu-3d.c | |
| parent | 5e6464f9c6756c95d036c4acf7ce557a7eb3a7be (diff) | |
| parent | 546323bdac18984c771ebefae1046ee61742f9ca (diff) | |
| download | focaccia-qemu-2ab6c494339652e69ec405dc779d83c46c8faf98.tar.gz focaccia-qemu-2ab6c494339652e69ec405dc779d83c46c8faf98.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/modules-20201029-pull-request' into staging
modules: build virtio-gpu-pci & virtio-vga modular. modules: various bugfixes, mostly for macos. # gpg: Signature made Thu 29 Oct 2020 11:09:41 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/modules-20201029-pull-request: modules: turn off lazy binding modules: unbreak them on macos virtio-gpu: only compile virtio-gpu-3d.c for CONFIG_VIRGL=y virtio-gpu: add virtio-vga module virtio-gpu: add virtio-gpu-pci module Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu-3d.c')
| -rw-r--r-- | hw/display/virtio-gpu-3d.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 1bd33d7aed..0b0c11474d 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -17,8 +17,6 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#ifdef CONFIG_VIRGL - #include <virglrenderer.h> static struct virgl_renderer_callbacks virtio_gpu_3d_cbs; @@ -633,5 +631,3 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) return capset2_max_ver ? 2 : 1; } - -#endif /* CONFIG_VIRGL */ |