curses: switch over to new display registry

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:38 +01:00
parent 5013b9e46a
commit b0766612d1
3 changed files with 15 additions and 28 deletions

17
vl.c
View file

@ -2168,12 +2168,7 @@ static void parse_display(const char *p)
exit(1);
#endif
} else if (strstart(p, "curses", &opts)) {
#ifdef CONFIG_CURSES
dpy.type = DISPLAY_TYPE_CURSES;
#else
error_report("curses support is disabled");
exit(1);
#endif
} else if (strstart(p, "gtk", &opts)) {
dpy.type = DISPLAY_TYPE_GTK;
while (*opts) {
@ -4660,17 +4655,9 @@ int main(int argc, char **argv, char **envp)
qemu_register_reset(restore_boot_order, g_strdup(boot_order));
}
ds = init_displaystate();
/* init local displays */
switch (dpy.type) {
case DISPLAY_TYPE_CURSES:
curses_display_init(ds, &dpy);
break;
default:
qemu_display_init(ds, &dpy);
break;
}
ds = init_displaystate();
qemu_display_init(ds, &dpy);
/* must be after terminal init, SDL library changes signal handlers */
os_setup_signal_handling();