From patchwork Wed Sep 27 06:13:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 114324 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4665154qgf; Tue, 26 Sep 2017 23:16:42 -0700 (PDT) X-Received: by 10.36.123.200 with SMTP id q191mr829005itc.83.1506493002173; Tue, 26 Sep 2017 23:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506493002; cv=none; d=google.com; s=arc-20160816; b=vg1EkdLyA5PrnKleVNzt9vYb78ksF6Di1zdX/369YnBBBVX0rWpc0p/8oOfFvljbjo BopjkEiZHEP4gU9iDxwMyhMqX2iUDTdVaC4Rv/DlUZjIwCDgLIYHmtQlZ8a0s41zuItt pTrddffqLsDmtdpoVKNOeNwpxNbk12rgT5EzylS2WeuzGAy0FN9LqSsP29BRPCH7AWU4 CGZwofeSm3qJhBsILP/B4R27jA+fnMU6N8vjmzF7v1Q5F0iIGpouO2i6hpjjA+0+hXnn l4hM2+47XdBMQUTPQOBdTOmcIOzDWThaDa8f8R+nSZXKI6R55M2zs25FX+wqpxcE5Gg3 H3GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=Bg6fT8CW/IMdJdKHwnAiGPV2040T6kKQ60tEt4w7sHw=; b=r6zn2hlLqU5HFedpACFsFKMa4EeHjMB0uRpK6EOnaPX5FZu62x+fgf4MdVLHYROrIb pNbATM7ZTt1ZS5R8kfZ0gDtKltw+1gHzNHeY9Djvab5p9kdk7mRPaWOE2iAKRk6CeTK6 IxW3Tm0LJK4phcib/6DFuj4QKx30gsovE8AUPhLDKq6lnEO3DThTHhggwBNRpAQATvet vv+I9BWlZjmIWK+HrgD63T8piD3tv2TCa/cIlI3GmJCuwwMyFieHZ2GQjY6zfn5SZIUM MolZd1G7Vs+9utNTsGyQEYVIERWCUFzlQhS/tg0PN1ejojfZSGOK64zzVMPq+wU37sCL DLFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=By+cHbaX; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id e141si8216204iof.90.2017.09.26.23.16.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Sep 2017 23:16:42 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=By+cHbaX; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dx5bi-0002qN-54; Wed, 27 Sep 2017 06:14:06 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dx5bh-0002ou-LI for xen-devel@lists.xenproject.org; Wed, 27 Sep 2017 06:14:05 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 11/F1-03283-DA14BC95; Wed, 27 Sep 2017 06:14:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsVyMfTANt01jqc jDWZdULH4vmUykwOjx+EPV1gCGKNYM/OS8isSWDOOr13GWrCZu2LCysgGxmecXYxcHEICMxkl Xty6yQrisAjMY5bYdfk7I4gjIdDPKnHzx0T2LkZOICdPYu7asywQdprE9c0PmboYOYDsConu5 kyQsJCAlsTRU7NZIaauYJJY/eIqG0gNm4CJxKwOCZAaEQEliXurJjOB1DALzGeUaJrUywaSEB aIkbh26Q7YLhYBVYkdc38wgdi8Aj4SV46uZYXYKydx81wnM4jNCRQ/3X+bDWKxt8Sllf2sExg FFzAyrGLUKE4tKkst0jUy1EsqykzPKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECAw4BiDY wfhnWcAhRkkOJiVR3pr/pyKF+JLyUyozEosz4otKc1KLDzHKcHAoSfDKOJyOFBIsSk1PrUjLz AGGPkxagoNHSYT3Gkiat7ggMbc4Mx0idYrRnuPCnUt/mDi+9N4Akgf23AKSHTfv/mESYsnLz0 uVEuetAmkTAGnLKM2DGwqL1UuMslLCvIxAZwrxFKQW5WaWoMq/YhTnYFQS5tUEmcKTmVcCt/s V0FlMQGf1Tj0BclZJIkJKqoExJForZ+enJzu8ebsYL8/qqv/xK/rQBkaXJsbVC3e6/HgZbK+W nqRhbRh4bULehyMcDLfXnV6bmyR/dHN036ude54L37kf0jGj7wlT1rZ3Zk+fef938w85ZqhYI r33jP2XY/PXX2gzrw+Kn89vXrQ7yOU4R+vP1iqBer0jzv86Jrv5vepP9ylWYinOSDTUYi4qTg QA54M+LtACAAA= X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1506492843!118876951!1 X-Originating-IP: [209.85.192.182] 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 24055 invoked from network); 27 Sep 2017 06:14:04 -0000 Received: from mail-pf0-f182.google.com (HELO mail-pf0-f182.google.com) (209.85.192.182) by server-6.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2017 06:14:04 -0000 Received: by mail-pf0-f182.google.com with SMTP id l188so6750948pfc.6 for ; Tue, 26 Sep 2017 23:14:04 -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=ibyLFSz2OCW5sE3Ydz65ZRFcFBf596L9bo9Hcmr8ZFk=; b=By+cHbaX+SE9xaDcfjg3nFLkrUV3MVx1qRWtLI4+hFLyZi8FyQ0aUEulPy0qmmMiSp haNKnDwxkN8IL3mzTS+9qpPaRhrETXxUEqGkr178qz5kUOmK3I/uZWDQ8kO+Arj4j/BY M3gBT/g8DTxaoNzqlZYv3dHAS2B3AHsFwKE9M= 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=ibyLFSz2OCW5sE3Ydz65ZRFcFBf596L9bo9Hcmr8ZFk=; b=uiOTGb+NwXQXG5RGzrzZfp4PHas3sAY24t2HI/cerCNtA1+gKVINcQfNFNyxsHDNFB WsJ1qKYzgr/S4zFFEhzUBkr/re05HypKtfouG2LV6REvMZd9TptVPtGQ9vHmpFmqOkmC fBJ7ET208wLrDrtBIqPICIOjZyEu6K1/52WNsi+hVg1VZH1MAR++2Qx4UK+GGfobMWXN l3fK/2JMJ2oYnRoVY04tvzIwmyX5eiEnYz8IXU9HZQ/1AM7UC5KszpUXxz0WNotaOkOr 2STC2kiGoUF8+i+wYk8neEUADgV3WcJSidk4ymzTgbYoQFD5L2ZUzl7zHX43PUqu03gc cMLg== X-Gm-Message-State: AHPjjUjU5zgYXUY9TORahZgQx8DtGfTzXMdJFqF7jYw5ZS6b9jfC3XL2 kJC8O557hEW47Ni1kOBiHD6MUzed57g= X-Google-Smtp-Source: AOwi7QAOg304QJK+LsI9h/l8adOwtGaNFeEQemvFEmk/kwFz1WoaX49lYRJnQmA4eh64oWTVUqbFpg== X-Received: by 10.98.70.221 with SMTP id o90mr325959pfi.277.1506492842717; Tue, 26 Sep 2017 23:14:02 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com (h3.248.139.40.ip.windstream.net. [40.139.248.3]) by smtp.gmail.com with ESMTPSA id s187sm18013485pgb.82.2017.09.26.23.14.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 23:14:02 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Wed, 27 Sep 2017 11:43:27 +0530 Message-Id: <1506492816-25954-19-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> References: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 18/27 v11] xen/arm: vpl011: Add a new console_cleanup 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" This patch introduces a new console_cleanup function. This function frees up the console resources. 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: - Removed a null pointer check before calling free() as free() already checks that. Changes since v5: - Split this change in a separate patch. tools/console/daemon/io.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 5c6da31..ff69e52 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -768,12 +768,8 @@ static void remove_domain(struct domain *dom) } } -static void cleanup_domain(struct domain *d) +static void console_cleanup(struct console *con) { - struct console *con = &d->console; - - console_close_tty(con); - if (con->log_fd != -1) { close(con->log_fd); con->log_fd = -1; @@ -784,6 +780,15 @@ static void cleanup_domain(struct domain *d) free(con->xspath); con->xspath = NULL; +} + +static void cleanup_domain(struct domain *d) +{ + struct console *con = &d->console; + + console_close_tty(con); + + console_cleanup(con); remove_domain(d); }