aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-03-01 11:05:38 +0100
committerGerd Hoffmann <kraxel@redhat.com>2018-03-05 08:44:11 +0100
commitb0766612d16da185a822636cf54214123e8038cf (patch)
tree21d23fe0aec6bd4bf7abeb8e3cd7db3469d2a049 /vl.c
parent5013b9e46a72c96999fab1523f722ab58152c59a (diff)
curses: switch over to new display registry
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20180301100547.18962-5-kraxel@redhat.com
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/vl.c b/vl.c
index 377140ebd9..5b2fca8bd3 100644
--- a/vl.c
+++ b/vl.c
@@ -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();