motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

console: add and use qemu_display_find_default

Browse source 
Using the new display registry instead of #ifdefs in vl.c.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-7-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:40 +01:00
parent 16ab0a74e4
commit 898f9d41d0
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
vl.c
View file

@ -4298,17 +4298,12 @@ int main(int argc, char **argv, char **envp)
}
#endif
if (dpy.type == DISPLAY_TYPE_DEFAULT && !display_remote) {
#if defined(CONFIG_GTK)
dpy.type = DISPLAY_TYPE_GTK;
#elif defined(CONFIG_SDL)
dpy.type = DISPLAY_TYPE_SDL;
#elif defined(CONFIG_COCOA)
dpy.type = DISPLAY_TYPE_COCOA;
#elif defined(CONFIG_VNC)
vnc_parse("localhost:0,to=99,id=default", &error_abort);
#else
dpy.type = DISPLAY_TYPE_NONE;
if (!qemu_display_find_default(&dpy)) {
dpy.type = DISPLAY_TYPE_NONE;
#if defined(CONFIG_VNC)
vnc_parse("localhost:0,to=99,id=default", &error_abort);
#endif
}
}
if (dpy.type == DISPLAY_TYPE_DEFAULT) {
dpy.type = DISPLAY_TYPE_NONE;