From: TeLeMan <geleman@gmail.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-trivial@nongnu.org, TeLeMan <geleman@gmail.com>,
qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-trivial] [PATCH] console: Don't expose the the ui module's functions when the module is not available.
Date: Tue, 26 Jul 2011 10:24:09 +0800 [thread overview]
Message-ID: <1311647049-1896-1-git-send-email-geleman@gmail.com> (raw)
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 <geleman@gmail.com>
---
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
--
1.7.3.1.msysgit.0
WARNING: multiple messages have this Message-ID (diff)
From: TeLeMan <geleman@gmail.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-trivial@nongnu.org, TeLeMan <geleman@gmail.com>,
qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH] console: Don't expose the the ui module's functions when the module is not available.
Date: Tue, 26 Jul 2011 10:24:09 +0800 [thread overview]
Message-ID: <1311647049-1896-1-git-send-email-geleman@gmail.com> (raw)
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 <geleman@gmail.com>
---
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
--
1.7.3.1.msysgit.0
next reply other threads:[~2011-07-26 2:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-26 2:24 TeLeMan [this message]
2011-07-26 2:24 ` [Qemu-devel] [PATCH] console: Don't expose the the ui module's functions when the module is not available TeLeMan
2011-07-26 2:32 ` [Qemu-trivial] " Anthony Liguori
2011-07-26 2:32 ` [Qemu-devel] " Anthony Liguori
2011-07-26 2:56 ` [Qemu-trivial] " TeLeMan
2011-07-26 2:56 ` [Qemu-devel] " TeLeMan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311647049-1896-1-git-send-email-geleman@gmail.com \
--to=geleman@gmail.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.