[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/13] console: add ui module loading support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/13] console: add ui module loading support |
Date: |
Mon, 5 Mar 2018 09:48:38 +0100 |
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 <address@hidden>
Message-id: address@hidden
---
Makefile.objs | 1 +
include/qemu/module.h | 1 +
ui/console.c | 6 ++++++
3 files changed, 8 insertions(+)
diff --git a/Makefile.objs b/Makefile.objs
index 5dc134818c..57ca6d908b 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 56dd218205..9fea75aaeb 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 25d342cdcb..78efab269a 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2199,6 +2199,9 @@ bool qemu_display_find_default(DisplayOptions *opts)
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;
}
opts->type = prio[i];
@@ -2214,6 +2217,9 @@ void qemu_display_early_init(DisplayOptions *opts)
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]);
exit(1);
--
2.9.3
- [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_*, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 02/13] sdl: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 05/13] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 04/13] curses: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 07/13] console: add ui module loading support,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 03/13] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 13/13] ui/sdl: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 06/13] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 10/13] ui/gtk: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 08/13] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 01/13] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 09/13] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 11/13] ui/curses: build as module, Gerd Hoffmann, 2018/03/05
- Re: [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Peter Maydell, 2018/03/05