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

This patch introduces a new maybe_add_console_evtchn_fd function. This
function adds the console event channel FD to list of polled FDs.

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

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 0009bbef56ef95c09e45283816ac55f1fc59d751..3483252eb0617d9a94ee8878a524b9d9d905a36e 100644 (file)
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -1047,6 +1047,26 @@ static void reset_fds(void)
                memset(fds, 0, sizeof(struct pollfd) * current_array_size);
 }
 
+static void maybe_add_console_evtchn_fd(struct console *con, void *data)
+{
+       long long next_timeout = *((long long *)data);
+
+       if (con->event_count >= RATE_LIMIT_ALLOWANCE) {
+               /* Determine if we're going to be the next time slice to expire */
+               if (!next_timeout ||
+                   con->next_period < next_timeout)
+                       next_timeout = con->next_period;
+       } else if (con->xce_handle != NULL) {
+               if (buffer_available(con)) {
+                       int evtchn_fd = xenevtchn_fd(con->xce_handle);
+                       con->xce_pollfd_idx = set_fds(evtchn_fd,
+                                                     POLLIN|POLLPRI);
+               }
+       }
+
+       *((long long *)data) = next_timeout;
+}
+
 void handle_io(void)
 {
        int ret;
@@ -1124,18 +1144,7 @@ void handle_io(void)
                for (d = dom_head; d; d = d->next) {
                        struct console *con = &d->console;
 
-                       if (con->event_count >= RATE_LIMIT_ALLOWANCE) {
-                               /* Determine if we're going to be the next time slice to expire */
-                               if (!next_timeout ||
-                                   con->next_period < next_timeout)
-                                       next_timeout = con->next_period;
-                       } else if (con->xce_handle != NULL) {
-                               if (buffer_available(con)) {
-                                       int evtchn_fd = xenevtchn_fd(con->xce_handle);
-                                       con->xce_pollfd_idx = set_fds(evtchn_fd,
-                                                                   POLLIN|POLLPRI);
-                               }
-                       }
+                       maybe_add_console_evtchn_fd(con, (void *)&next_timeout);
 
                        if (con->master_fd != -1) {
                                short events = 0;