From patchwork Fri Sep 22 08:23:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 9965447 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B8E916020C for ; Fri, 22 Sep 2017 08:26:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A698528975 for ; Fri, 22 Sep 2017 08:26:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B17A28E17; Fri, 22 Sep 2017 08:26:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 265CA28D9B for ; Fri, 22 Sep 2017 08:26:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJG2-000492-KZ; Fri, 22 Sep 2017 08:24:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJG1-00047b-Ix for xen-devel@lists.xenproject.org; Fri, 22 Sep 2017 08:24:21 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id DD/50-03283-4B8C4C95; Fri, 22 Sep 2017 08:24:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsXiVRtsqrvxxJF Ig8vbLS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy32y6yFrQIVJyc+o+lgXE1bxcjF4eQwDRG ibbHT9hBHBaBecwSa9acZAFxJAT6WSXunvjP1MXICeTkSWy/tp4Zwk6TWN03mQXCrpL4cPc1W I2QgJbE0VOzWSHsHUwS77dFdDFycLAJmEjM6pAACYsIKEncWzWZCWQ+s8B8RommSb1sIDXCAq kSP3tNQGpYBFQlPq36wAhi8wr4SOz/NZMdYpWcxM1znWAncALF1/7fwAKxylti642rLBMYBRc wMqxi1ChOLSpLLdI1MtNLKspMzyjJTczM0TU0MNPLTS0uTkxPzUlMKtZLzs/dxAgMOAYg2MF4 ZkHgIUZJDiYlUd7HR45ECvEl5adUZiQWZ8QXleakFh9ilOHgUJLgtT8OlBMsSk1PrUjLzAGGP kxagoNHSYQ3HCTNW1yQmFucmQ6ROsVozLFvz60/TBwdN+/+YRJiycvPS5US5w0AKRUAKc0ozY MbBIvJS4yyUsK8jECnCfEUpBblZpagyr9iFOdgVBLmjQGZwpOZVwK37xXQKUxAp5SvBjulJBE hJdXAuP/D949vXgbxq+/Q1n0WqHsk7vykc8fUXj4quP7h7UKXJ0wr76SVcX+KEXCf3vV5dW9C 3aIMo9V/+jdu/zdbT6FowsEayX7bGS3fjS2abvxdrX74dZq7x2LRh/0bzrzZb7vt9rKZLoXnP v/+Mvdmyr+qXNOIH7ufr+2b2X1dYLeFkIzw7c9CO/4rsRRnJBpqMRcVJwIAUYSeEMQCAAA= X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1506068656!76101097!1 X-Originating-IP: [74.125.83.53] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30976 invoked from network); 22 Sep 2017 08:24:17 -0000 Received: from mail-pg0-f53.google.com (HELO mail-pg0-f53.google.com) (74.125.83.53) by server-5.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 22 Sep 2017 08:24:17 -0000 Received: by mail-pg0-f53.google.com with SMTP id j16so255109pga.1 for ; Fri, 22 Sep 2017 01:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1zZv5gMZFdWN6HyPnIRtGQbrCrYIkCirHr84Vy7ho9I=; b=ZkdUfrmr+17byFQvMWMxfpJjNLLyCvCQ0S1D5Eu+wnPeLw1+l2kqj/pk9TmAx2Yxfb MYaUMWy408OgytN8rHAEObEvYnyT0pbb+J1dEtpTfXL/FQoRidtwLYOwRgmelFZm6OZf buOx1g8P9Wafr8couA0D0cknMW+9x91cH+Zdg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1zZv5gMZFdWN6HyPnIRtGQbrCrYIkCirHr84Vy7ho9I=; b=q2OAVxodpKpa16u6hEeettQTD5svZh7XwxqyDqrmANP4NRElCDCfw+Lhnjk1AHjG5H FgOW8rsNZkEjh7JqW6a7Pc3NTsdgEIZZ+/Lz2ak8UVmgGy9WmG6XRW7JKIqgyrrLy8hm IFrD9XB89rtTKQfXvfb9+EC9lVR6GRBilXj0OuFzFTx0sDyN0Q3/viFg2cGeJit32Bn3 bNc5PcfktVCvnGAeb9eaMigQtlQSRSmjzJgOSbfsc6T+CnTqWAQRhp/y1JCmK9x9PNa/ EADT2UwkRdWt5Jb9V8HZfl1cW77hubruaB5x5a+r1qwvrsWreSLRPgbMpmhx0zaCA6FS Kpgw== X-Gm-Message-State: AHPjjUhxpjHQnSmuPMGC8Ut1/T4IZf9K4SeaveZCZ9anmwIymjL6idZS cpX4WetbvxTKGv+bG5b7hqitz/vFFYo= X-Google-Smtp-Source: AOwi7QB8b/NZxqC0J7KXBHP0XEfrbMLxEuae1qWiHXoXZ2ocnPEQy+2Ci04Lo0PvtmVS5jZCNMo8VA== X-Received: by 10.98.102.142 with SMTP id s14mr8333584pfj.174.1506068656364; Fri, 22 Sep 2017 01:24:16 -0700 (PDT) Received: from blr-ubuntu-linaro.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id f74sm5569284pfa.36.2017.09.22.01.24.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 01:24:16 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Fri, 22 Sep 2017 13:53:13 +0530 Message-Id: <1506068606-17066-15-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506068606-17066-1-git-send-email-bhupinder.thakur@linaro.org> References: <1506068606-17066-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 14/27 v10] xen/arm: vpl011: Add a new maybe_add_console_tty_fd function in xenconsole X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Stefano Stabellini Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall Changes since v6: - Renamed add_console_tty_fd to maybe_add_console_tty_fd since it adds the tty FD to the poll list conditionally. - I have retained the reviewed-by tag as only the function name has been changed. Changes since v5: - Split this change in a separate patch. tools/console/daemon/io.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 3483252..a0b35da 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