diff options
| author | Peter Maydell | 2020-10-31 21:32:56 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-10-31 21:32:56 +0100 |
| commit | 2ab6c494339652e69ec405dc779d83c46c8faf98 (patch) | |
| tree | 90f273aa9c284113945b76552164a3631674feb7 /util | |
| parent | Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-next-pull-req... (diff) | |
| parent | modules: turn off lazy binding (diff) | |
| download | qemu-2ab6c494339652e69ec405dc779d83c46c8faf98.tar.gz qemu-2ab6c494339652e69ec405dc779d83c46c8faf98.tar.xz 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 'util')
| -rw-r--r-- | util/module.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/util/module.c b/util/module.c index fe3b82dd4d..c65060c167 100644 --- a/util/module.c +++ b/util/module.c @@ -132,7 +132,7 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols assert(QTAILQ_EMPTY(&dso_init_list)); - flags = G_MODULE_BIND_LAZY; + flags = 0; if (!export_symbols) { flags |= G_MODULE_BIND_LOCAL; } @@ -301,6 +301,12 @@ static struct { { "qxl", "hw-", "display-qxl" }, { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, { "vhost-user-gpu", "hw-", "display-virtio-gpu" }, + { "virtio-gpu-pci-base", "hw-", "display-virtio-gpu-pci" }, + { "virtio-gpu-pci", "hw-", "display-virtio-gpu-pci" }, + { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu-pci" }, + { "virtio-vga-base", "hw-", "display-virtio-vga" }, + { "virtio-vga", "hw-", "display-virtio-vga" }, + { "vhost-user-vga", "hw-", "display-virtio-vga" }, { "chardev-braille", "chardev-", "baum" }, { "chardev-spicevmc", "chardev-", "spice" }, { "chardev-spiceport", "chardev-", "spice" }, |