diff options
| author | Peter Maydell | 2020-09-15 15:25:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-15 15:25:05 +0200 |
| commit | de39a045bd8d2b49e4f3d07976622c29d58e0bac (patch) | |
| tree | 231d716865f302c58722a120478fa4948083d95c /util/module.c | |
| parent | Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20200915' into ... (diff) | |
| parent | virtio-gpu: build modular (diff) | |
| download | qemu-de39a045bd8d2b49e4f3d07976622c29d58e0bac.tar.gz qemu-de39a045bd8d2b49e4f3d07976622c29d58e0bac.tar.xz 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 'util/module.c')
| -rw-r--r-- | util/module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/module.c b/util/module.c index 6e63006a8f..34772e7d87 100644 --- a/util/module.c +++ b/util/module.c @@ -265,6 +265,8 @@ static struct { { "usb-redir", "hw-", "usb-redirect" }, { "qxl-vga", "hw-", "display-qxl" }, { "qxl", "hw-", "display-qxl" }, + { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, + { "vhost-user-gpu", "hw-", "display-virtio-gpu" }, { "chardev-braille", "chardev-", "baum" }, }; |