[Xen-changelog] [xen-unstable] xenconsole: Compile fixes for console code on Solaris

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236766111 0
# Node ID 07042b677ba4bfa5523fdd6bc34180724835934c
# Parent  1282561a2bf289942284b222631ad4c2565e1c4e
xenconsole: Compile fixes for console code on Solaris

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/console/client/main.c |   15 +++++++++++++++
 tools/console/daemon/main.c |    2 ++
 2 files changed, 17 insertions(+)

diff -r 1282561a2bf2 -r 07042b677ba4 tools/console/client/main.c
--- a/tools/console/client/main.c       Wed Mar 11 10:07:06 2009 +0000
+++ b/tools/console/client/main.c       Wed Mar 11 10:08:31 2009 +0000
@@ -71,6 +71,21 @@ static void usage(const char *program) {
               , program);
 }
 
+#ifdef __sun__
+void cfmakeraw (struct termios *termios_p)
+{
+       termios_p->c_iflag &=
+           ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+       termios_p->c_oflag &= ~OPOST;
+       termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+       termios_p->c_cflag &= ~(CSIZE|PARENB);
+       termios_p->c_cflag |= CS8;
+
+       termios_p->c_cc[VMIN] = 0;
+       termios_p->c_cc[VTIME] = 0;
+}
+#endif
+
 static int get_pty_fd(struct xs_handle *xs, char *path, int seconds)
 /* Check for a pty in xenstore, open it and return its fd.
  * Assumes there is already a watch set in the store for this path. */
diff -r 1282561a2bf2 -r 07042b677ba4 tools/console/daemon/main.c
--- a/tools/console/daemon/main.c       Wed Mar 11 10:07:06 2009 +0000
+++ b/tools/console/daemon/main.c       Wed Mar 11 10:08:31 2009 +0000
@@ -86,7 +86,9 @@ int main(int argc, char **argv)
                        version(argv[0]);
                        exit(0);
                case 'v':
+#ifndef __sun__
                        syslog_option |= LOG_PERROR;
+#endif
                        syslog_mask = LOG_DEBUG;
                        break;
                case 'i':

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog