diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-09 17:02:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-09 17:02:29 +0100 |
| commit | aff2caf6b3fbab1062e117a47b66d27f7fd2f272 (patch) | |
| tree | 75bf4ee375bd40ecb542ccacfe4328c88811b088 /softmmu | |
| parent | 3d7cad3c2388cb74451d50cf455a42d349236161 (diff) | |
| parent | ef138c77249771081d8c2d09b8e729f7e92cdf28 (diff) | |
| download | qemu-aff2caf6b3fbab1062e117a47b66d27f7fd2f272.zip qemu-aff2caf6b3fbab1062e117a47b66d27f7fd2f272.tar.gz qemu-aff2caf6b3fbab1062e117a47b66d27f7fd2f272.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/modules-20200707-pull-request' into staging
qom: add support for qom objects in modules.
build some devices (qxl, virtio-gpu, ccid, usb-redir) as modules.
build braille chardev as module.
v2: more verbose comment for "build: fix device module builds" patch.
note: qemu doesn't rebuild objects on cflags changes (specifically
-fPIC being added when code is switched from builtin to module).
Workaround for resulting build errors: "make clean", rebuild.
# gpg: Signature made Tue 07 Jul 2020 14:42:16 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/modules-20200707-pull-request:
chardev: enable modules, use for braille
vga: build virtio-gpu as module
vga: build virtio-gpu only once
vga: build qxl as module
usb: build usb-redir as module
ccid: build smartcard as module
build: fix device module builds
qdev: device module support
object: qom module support
module: qom module support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index ecbc18b..3f58ffd 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1772,8 +1772,8 @@ static bool vga_interface_available(VGAInterfaceType t) assert(t < VGA_TYPE_MAX); return !ti->class_names[0] || - object_class_by_name(ti->class_names[0]) || - object_class_by_name(ti->class_names[1]); + module_object_class_by_name(ti->class_names[0]) || + module_object_class_by_name(ti->class_names[1]); } static const char * |