diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-15 14:25:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-15 14:25:05 +0100 |
| commit | de39a045bd8d2b49e4f3d07976622c29d58e0bac (patch) | |
| tree | 231d716865f302c58722a120478fa4948083d95c /hw/display/virtio-gpu-base.c | |
| parent | 6c938efc27c2c9c9b02d574d0522a83dc06c72c8 (diff) | |
| parent | 7b0de5b7969e695d6235525654a8a28a0d82a0e0 (diff) | |
| download | focaccia-qemu-de39a045bd8d2b49e4f3d07976622c29d58e0bac.tar.gz focaccia-qemu-de39a045bd8d2b49e4f3d07976622c29d58e0bac.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200915-pull-request' into staging
vga: fix qxl modular build. vga: add support for virtio-gpu modular builds. # gpg: Signature made Tue 15 Sep 2020 14:08:53 BST # 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/vga-20200915-pull-request: virtio-gpu: build modular virtio-gpu: make virtio_gpu_ops static object_initialize: try module load meson: remove duplicate qxl sources meson: fix module config meson: fix qxl dependencies Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu-base.c')
| -rw-r--r-- | hw/display/virtio-gpu-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 7961308606..aeb8723542 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -112,7 +112,7 @@ virtio_gpu_gl_block(void *opaque, bool block) } } -const GraphicHwOps virtio_gpu_ops = { +static const GraphicHwOps virtio_gpu_ops = { .invalidate = virtio_gpu_invalidate_display, .gfx_update = virtio_gpu_update_display, .text_update = virtio_gpu_text_update, @@ -162,6 +162,7 @@ virtio_gpu_base_device_realize(DeviceState *qdev, g->req_state[0].width = g->conf.xres; g->req_state[0].height = g->conf.yres; + g->hw_ops = &virtio_gpu_ops; for (i = 0; i < g->conf.max_outputs; i++) { g->scanout[i].con = graphic_console_init(DEVICE(g), i, &virtio_gpu_ops, g); |