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

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

patchbot
commit 11b933a228e7d9ada24509d69bcf204cd1d8deb8
Author:     Bhupinder Thakur <[hidden email]>
AuthorDate: Wed Sep 27 11:43:22 2017 +0530
Commit:     Stefano Stabellini <[hidden email]>
CommitDate: Tue Oct 3 15:23:37 2017 -0700

    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 <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
---
 tools/console/daemon/io.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 0009bbe..3483252 100644
--- 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;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog