diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-01 11:05:40 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-05 08:44:11 +0100 |
| commit | 898f9d41d02d577ac863069772f0708268d2f926 (patch) | |
| tree | 5104e3d61a3ec307bd88fdd1bf4551eae6357121 /vl.c | |
| parent | 16ab0a74e44300add9a7966e6f4f95ed4c0e833e (diff) | |
console: add and use qemu_display_find_default
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
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -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; |