mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console: add ui module loading support

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:41 +01:00
parent 898f9d41d0
commit 61b4d9a246
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -56,6 +56,7 @@ common-obj-y += hw/
common-obj-y += replay/ common-obj-y += replay/
common-obj-y += ui/ common-obj-y += ui/
common-obj-m += ui/
common-obj-y += bt-host.o bt-vhci.o common-obj-y += bt-host.o bt-vhci.o
bt-host.o-cflags := $(BLUEZ_CFLAGS) bt-host.o-cflags := $(BLUEZ_CFLAGS)

1
include/qemu/module.h
View File

@ -53,6 +53,7 @@ typedef enum {
#define trace_init(function) module_init(function, MODULE_INIT_TRACE) #define trace_init(function) module_init(function, MODULE_INIT_TRACE)
#define block_module_load_one(lib) module_load_one("block-", lib) #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_module_init(void (*fn)(void), module_init_type type);
void register_dso_module_init(void (*fn)(void), module_init_type type); void register_dso_module_init(void (*fn)(void), module_init_type type);

6
ui/console.c
View File

@ -2198,6 +2198,9 @@ bool qemu_display_find_default(DisplayOptions *opts)
int i; int i;
for (i = 0; i < ARRAY_SIZE(prio); 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) { if (dpys[prio[i]] == NULL) {
continue; continue;
} }
@ -2213,6 +2216,9 @@ void qemu_display_early_init(DisplayOptions *opts)
if (opts->type == DISPLAY_TYPE_NONE) { if (opts->type == DISPLAY_TYPE_NONE) {
return; return;
} }
if (dpys[opts->type] == NULL) {
ui_module_load_one(DisplayType_lookup.array[opts->type]);
}
if (dpys[opts->type] == NULL) { if (dpys[opts->type] == NULL) {
error_report("Display '%s' is not available.", error_report("Display '%s' is not available.",
DisplayType_lookup.array[opts->type]); DisplayType_lookup.array[opts->type]);