From patchwork Tue Apr 2 16:42:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 161638 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1963924jan; Tue, 2 Apr 2019 09:44:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2WtJjjAa/ie/mpGWLdOoa505FI8nLFgbl7FiGziCvp6IcXFbWKs4tE1i96D399ntW9N1f X-Received: by 2002:a25:6942:: with SMTP id e63mr2328943ybc.470.1554223461773; Tue, 02 Apr 2019 09:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554223461; cv=none; d=google.com; s=arc-20160816; b=VeoglpsEZzFBAScyhNPeY10RthvLvd6Ta1XGym9KM0kM1FvR2GcppPM7wULT4PG/1z m3arPcbDOhv8kuNkPaVB/sVceOBHYkdMURwko8/BCh7/JstGtdJzdGf+0/vwLG/Y/H0p J8F+UlPKo09vc8OG9J7FIf3OhnzdHTzPv2guNqss4hOdAp6hln55ouGxqN7JmJpK6Gn6 t23085Qzn0lA6Mh+0gN7xBbB1+58PjGWUvqu0Ra4eecPdKpfQ3B0FSaCtXjUCZqG8aCi A5F9NzO30Rmp5ce+BVpsRRcM1JuVIyRfOAbKO2gnmmbfMOyu3gbECC4CSTipiU1z39xV xl6Q== 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:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=Aht7Po8VW5djS/RWLKjrqjh/KFfWBBC29k6/osP6qz4=; b=jjnWURv3iQhQDJyBnisIRhaNC/EePwY2s13oawpYRUkT0PMhW6dBOFhukL1THkUERr rrj+usJdbGcaI0vaK3l/4X2f3Qhth+XCnmn4us12PL76mMNwJBLpXEAgvGPz+K/ni6nV /O3yyWQ2+HDlwHKecLw2DlH9FdEmiQmv7Ptyramoly+51PHleCOp1pstVSfhauFUDwfG f1Bv4dRwdaKu4ja/OE5YzYaVh5UtV9iLbm+2sRvA0rFCqrRuMtOM4E1S3fmWe7jpVf4v 9p3F5bS0TBo+/jB6tXMsbURRfWJLMRGNImETfry2ngn9ki/5SHezbMqQpAN9s+nhsFQ2 GSQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id a77si8090141ywa.135.2019.04.02.09.44.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2019 09:44:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hBMV4-0005zb-Mx; Tue, 02 Apr 2019 16:43:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hBMV2-0005yz-Sa for xen-devel@lists.xenproject.org; Tue, 02 Apr 2019 16:43:00 +0000 X-Inumbo-ID: 605738a0-5566-11e9-9a61-6fe3d858de2e Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 605738a0-5566-11e9-9a61-6fe3d858de2e; Tue, 02 Apr 2019 16:43:00 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 148BA15AD; Tue, 2 Apr 2019 09:43:00 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 467C33F721; Tue, 2 Apr 2019 09:42:58 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 2 Apr 2019 17:42:38 +0100 Message-Id: <20190402164238.1815-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190402164238.1815-1-julien.grall@arm.com> References: <20190402164238.1815-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 4/4] xen/console: Simplify domU console handling in guest_console_write X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 2 paths in the domU console handling are now the same. So they can be merged to make the code simpler. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index b119bf980b..5483d66512 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -584,13 +584,8 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) *kout = '\0'; spin_lock(&cd->pbuf_lock); kcount = kin - kbuf; - if ( c == '\n' ) - { - cd->pbuf[cd->pbuf_idx] = '\0'; - guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); - cd->pbuf_idx = 0; - } - else if ( cd->pbuf_idx + (kout - kbuf) < (DOMAIN_PBUF_SIZE - 1) ) + if ( c != '\n' && + (cd->pbuf_idx + (kout - kbuf) < (DOMAIN_PBUF_SIZE - 1)) ) { /* buffer the output until a newline */ memcpy(cd->pbuf + cd->pbuf_idx, kbuf, kout - kbuf);