[Qemu-devel] [PATCH v2 3/7] stubs: curses_display_init() stub

[Eduardo Habkost <ehabkost@redhat.com>]

One less #ifdef in vl.c.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v1 -> v2:
* Move stub file to stubs/ui/
---
 stubs/ui/Makefile.objs |  1 +
 stubs/ui/curses.c      | 10 ++++++++++
 vl.c                   |  2 --
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 stubs/ui/curses.c

diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs
index 16ea29a..2f63c58 100644
--- a/stubs/ui/Makefile.objs
+++ b/stubs/ui/Makefile.objs
@@ -1 +1,2 @@
 stub-obj-y += vnc.o
+stub-obj-y += curses.o
diff --git a/stubs/ui/curses.c b/stubs/ui/curses.c
new file mode 100644
index 0000000..2115c77
--- /dev/null
+++ b/stubs/ui/curses.c
@@ -0,0 +1,10 @@
+#include "qemu-common.h"
+#include "ui/console.h"
+#include "qemu/error-report.h"
+
+void curses_display_init(DisplayState *ds, int full_screen)
+{
+    /* This must never be called if CONFIG_CURSES is disabled */
+    error_report("curses support is disabled");
+    abort();
+}
diff --git a/vl.c b/vl.c
index 0558e87..3ca1c11 100644
--- a/vl.c
+++ b/vl.c
@@ -4568,11 +4568,9 @@ int main(int argc, char **argv, char **envp)
     case DT_NOGRAPHIC:
         (void)ds;	/* avoid warning if no display is configured */
         break;
-#if defined(CONFIG_CURSES)
     case DT_CURSES:
         curses_display_init(ds, full_screen);
         break;
-#endif
 #if defined(CONFIG_SDL)
     case DT_SDL:
         sdl_display_init(ds, full_screen, no_frame);
-- 
2.1.0