[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] console: add ui module loading support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 07/12] console: add ui module loading support |
Date: |
Wed, 21 Feb 2018 14:15:32 +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>
---
include/qemu/module.h | 1 +
ui/console.c | 6 ++++++
2 files changed, 7 insertions(+)
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 5a63e9dfa2..dd663b9127 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2189,6 +2189,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];
@@ -2204,6 +2207,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] [PATCH 08/12] configure: add X11 vars to config-host.mak, (continued)
- [Qemu-devel] [PATCH 08/12] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 12/12] curses: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 02/12] sdl: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 07/12] console: add ui module loading support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/21