diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-01 11:05:38 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-05 08:44:11 +0100 |
| commit | b0766612d16da185a822636cf54214123e8038cf (patch) | |
| tree | 21d23fe0aec6bd4bf7abeb8e3cd7db3469d2a049 /vl.c | |
| parent | 5013b9e46a72c96999fab1523f722ab58152c59a (diff) | |
| download | focaccia-qemu-b0766612d16da185a822636cf54214123e8038cf.tar.gz focaccia-qemu-b0766612d16da185a822636cf54214123e8038cf.zip | |
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.c | 17 |
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(); |