From: Bhupinder Thakur <bhupinder.thakur@linaro.org>
Date: Wed, 27 Sep 2017 06:13:23 +0000 (+0530)
Subject: xen/arm: vpl011: Add a new maybe_add_console_tty_fd function in xenconsole
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1252
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03b84bf90c8c3935ab67e7473f696c6d86fbb463;p=xen.git

xen/arm: vpl011: Add a new maybe_add_console_tty_fd function in xenconsole

This patch introduces a new maybe_add_console_tty_fd function. This function
adds the tty fd to the list of polled fds.

Signed-off-by: Bhupinder Thakur <bhupinder.thakur@linaro.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 3483252eb0..a0b35da45c 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -1067,6 +1067,22 @@ static void maybe_add_console_evtchn_fd(struct console *con, void *data)
 	*((long long *)data) = next_timeout;
 }
 
+static void maybe_add_console_tty_fd(struct console *con)
+{
+	if (con->master_fd != -1) {
+		short events = 0;
+		if (!con->d->is_dead && ring_free_bytes(con))
+			events |= POLLIN;
+
+		if (!buffer_empty(&con->buffer))
+			events |= POLLOUT;
+
+		if (events)
+			con->master_pollfd_idx =
+				set_fds(con->master_fd, events|POLLPRI);
+	}
+}
+
 void handle_io(void)
 {
 	int ret;
@@ -1146,19 +1162,7 @@ void handle_io(void)
 
 			maybe_add_console_evtchn_fd(con, (void *)&next_timeout);
 
-			if (con->master_fd != -1) {
-				short events = 0;
-				if (!d->is_dead && ring_free_bytes(con))
-					events |= POLLIN;
-
-				if (!buffer_empty(&con->buffer))
-					events |= POLLOUT;
-
-				if (events)
-					con->master_pollfd_idx =
-						set_fds(con->master_fd,
-							events|POLLPRI);
-			}
+			maybe_add_console_tty_fd(con);
 		}
 
 		/* If any domain has been rate limited, we need to work