From patchwork Tue Jul 26 02:24:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 106773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF71FB6F8E for ; Tue, 26 Jul 2011 12:23:14 +1000 (EST) Received: from localhost ([::1]:58733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlXIb-0004Kw-OS for incoming@patchwork.ozlabs.org; Mon, 25 Jul 2011 22:23:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlXIW-0004Kf-1Y for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlXIV-0007ed-30 for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:23:03 -0400 Received: from mail-pz0-f43.google.com ([209.85.210.43]:56160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlXIU-0007eY-RY; Mon, 25 Jul 2011 22:23:03 -0400 Received: by pzk1 with SMTP id 1so9821068pzk.30 for ; Mon, 25 Jul 2011 19:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=HxiKlBuRVXXm/yxDLZZH5PbN/dvKd1gljcve8qMMQHE=; b=Wnos9qDHFplVO64WJzkT3wCXDRrRCXi1Uczy7t6FZ9yaRGnhPP7lctkt5aiBlX3k96 kl2YWNDk9JyzseaJRFxivW775KbpDifvlpd5Cgd/lGzoP7nWwcMWcq7FKfqfGYwvm/cD 5bCgAQefC0krkcvXzey5a0yfQwYfvyjFcg/3E= Received: by 10.68.66.3 with SMTP id b3mr8636463pbt.196.1311646981460; Mon, 25 Jul 2011 19:23:01 -0700 (PDT) Received: from localhost.localdomain ([211.101.48.70]) by mx.google.com with ESMTPS id q2sm22407pbj.19.2011.07.25.19.22.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jul 2011 19:23:00 -0700 (PDT) From: TeLeMan To: Anthony Liguori Date: Tue, 26 Jul 2011 10:24:09 +0800 Message-Id: <1311647049-1896-1-git-send-email-geleman@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.43 Cc: qemu-trivial@nongnu.org, TeLeMan , qemu-devel Subject: [Qemu-devel] [PATCH] console: Don't expose the the ui module's functions when the module is not available. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If there is no sdl support, the implement of sdl_display_init() is missing and its declaration should not be exposed. vnc, cocoa, curses and other ui modules are the same as sdl. Signed-off-by: TeLeMan --- console.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/console.h b/console.h index 67d1373..ede8bea 100644 --- a/console.h +++ b/console.h @@ -363,19 +363,24 @@ void qemu_console_copy(DisplayState *ds, int src_x, int src_y, int dst_x, int dst_y, int w, int h); /* sdl.c */ +#ifdef CONFIG_SDL void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); +#endif /* cocoa.m */ +#ifdef CONFIG_COCOA void cocoa_display_init(DisplayState *ds, int full_screen); +#endif /* vnc.c */ +#ifdef CONFIG_VNC void vnc_display_init(DisplayState *ds); void vnc_display_close(DisplayState *ds); int vnc_display_open(DisplayState *ds, const char *display); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); -#ifdef CONFIG_VNC + int vnc_display_password(DisplayState *ds, const char *password); int vnc_display_pw_expire(DisplayState *ds, time_t expires); void do_info_vnc_print(Monitor *mon, const QObject *data); @@ -401,6 +406,8 @@ static inline void do_info_vnc_print(Monitor *mon, const QObject *data) #endif /* curses.c */ +#ifdef CONFIG_CURSES void curses_display_init(DisplayState *ds, int full_screen); +#endif #endif