[Qemu-devel] [PATCH for-2.7 v3 03/12] curses: curses_display_init() stub

From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Marcel Apfelbaum <marcel@redhat.com>
Subject: [Qemu-devel] [PATCH for-2.7 v3 03/12] curses: curses_display_init() stub
Date: Tue, 19 Apr 2016 16:55:19 -0300	[thread overview]
Message-ID: <1461095728-22055-4-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1461095728-22055-1-git-send-email-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/

Changes v2 -> v3:
* Move stub to header file
---
 include/ui/console.h | 9 +++++++++
 vl.c                 | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/ui/console.h b/include/ui/console.h
index 6640348..f5fa9cb 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -466,7 +466,16 @@ static inline char *vnc_display_local_addr(const char *id)
 #endif
 
 /* curses.c */
+#ifdef CONFIG_CURSES
 void curses_display_init(DisplayState *ds, int full_screen);
+#else
+static inline 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();
+}
+#endif
 
 /* input.c */
 int index_from_key(const char *key, size_t key_length);
diff --git a/vl.c b/vl.c
index cdb06dc..6e2336e 100644
--- a/vl.c
+++ b/vl.c
@@ -4540,11 +4540,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
