From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8S-0002HJ-Qj for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3r2h-00017y-2n for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3r2g-00017n-U6 for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:07 -0400 From: Eduardo Habkost Date: Fri, 20 May 2016 17:28:27 -0300 Message-Id: <1463776121-13529-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> References: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost --- 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 a66d04a..c852d10 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.5.5