From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 1 Mar 2018 10:05:41 +0000 (+0100)
Subject: console: add ui module loading support
X-Git-Tag: v2.12.0-rc0~52^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61b4d9a24668d3b14f80d25ab66f6081f1ab7b17;p=thirdparty%2Fqemu.git

console: add ui module loading support

If a requested user interface is not available, try loading it as
module, simliar to block layer modules.  Needed to keep things working
when followup patches start to build user interfaces as modules.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-8-kraxel@redhat.com
---

diff --git a/Makefile.objs b/Makefile.objs
index 5dc134818c9..57ca6d908bc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -56,6 +56,7 @@ common-obj-y += hw/
 common-obj-y += replay/
 
 common-obj-y += ui/
+common-obj-m += ui/
 common-obj-y += bt-host.o bt-vhci.o
 bt-host.o-cflags := $(BLUEZ_CFLAGS)
 
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 56dd2182054..9fea75aaebd 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -53,6 +53,7 @@ typedef enum {
 #define trace_init(function) module_init(function, MODULE_INIT_TRACE)
 
 #define block_module_load_one(lib) module_load_one("block-", lib)
+#define ui_module_load_one(lib) module_load_one("ui-", lib)
 
 void register_module_init(void (*fn)(void), module_init_type type);
 void register_dso_module_init(void (*fn)(void), module_init_type type);
diff --git a/ui/console.c b/ui/console.c
index 25d342cdcbb..78efab269ad 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2198,6 +2198,9 @@ bool qemu_display_find_default(DisplayOptions *opts)
     int i;
 
     for (i = 0; i < ARRAY_SIZE(prio); i++) {
+        if (dpys[prio[i]] == NULL) {
+            ui_module_load_one(DisplayType_lookup.array[prio[i]]);
+        }
         if (dpys[prio[i]] == NULL) {
             continue;
         }
@@ -2213,6 +2216,9 @@ void qemu_display_early_init(DisplayOptions *opts)
     if (opts->type == DISPLAY_TYPE_NONE) {
         return;
     }
+    if (dpys[opts->type] == NULL) {
+        ui_module_load_one(DisplayType_lookup.array[opts->type]);
+    }
     if (dpys[opts->type] == NULL) {
         error_report("Display '%s' is not available.",
                      DisplayType_lookup.array[opts->type]);