From patchwork Mon Aug 28 15:41:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 111173 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp5017151qge; Mon, 28 Aug 2017 08:42:59 -0700 (PDT) X-Received: by 10.55.164.136 with SMTP id n130mr1420399qke.215.1503934979340; Mon, 28 Aug 2017 08:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503934979; cv=none; d=google.com; s=arc-20160816; b=egUHGp8HIWVPqF+biQ/Y1sptzq3kYbhueZU0R99Yhf7pEu+Xd9Wz1b3dEPKGZM5+YL 4wfpR+X3JzYuDhp2MgCII6f04/g9iTrLR/9sa9AWVhnGMRVicfaN1Vj7+jh+6EbPFyY6 6WcUiR8AS5SXskTmLt7mU7dycKEIgmJbgcJ/VWOPimcyaEHg0UISz3DONeufGxAyFsHr DF7BNO7t0jMSomrrGhgDxw+jo92Xcrc6rCG0cyyHfrCkkW7QRgC06zRlTeakPw92vm3M dbpR0QL68j9hlUO5m6kpNQLy/CeP3OzOAMQuwnH8K9bKEoApoX9sM0cgjYhsCKoNBlC9 +xfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :arc-authentication-results; bh=dCeV+7NCFFLFWlPBg5wLl+9DfV0ZEhor2MNXwnNU/wY=; b=S9W4lEwUGCGgsKkRcSZMbFD5aCpCik95vCMl5pEK4GcRw8IRm6eshJvYeTp+RUAy+0 bMyUuO/QM27lbrfbIcngTU5HT/ZwQQM/34ztp+MJUKs4C/M3bigPbADJCWYUB2KthlCD e6A7CP+VVecFLc4BUJPS22PgtxXr19Ojuyhq/RTLKdV6TkwA9vzb+5rgNvzJKLkGNDU5 HcZSXyN6wrLSq0OOSluf21AfCXuWaR1WoopQy8Om/t9U/DODk3GKr3I2Irm7mH4O1VIW MiNNJ/CmIaXNp25CARLBpmKZNrqKM2FP6ZE6fE1m3XPWhGMSpTrkp7vXgB6zR3kPstLw qmGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q63si641122qkl.198.2017.08.28.08.42.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 28 Aug 2017 08:42:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmMBl-0002im-B0 for patch@linaro.org; Mon, 28 Aug 2017 11:42:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmMAo-0002Lq-R0 for qemu-devel@nongnu.org; Mon, 28 Aug 2017 11:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmMAj-0007sf-Vv for qemu-devel@nongnu.org; Mon, 28 Aug 2017 11:41:58 -0400 Received: from mx2.suse.de ([195.135.220.15]:56268 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmMAj-0007sQ-Ot for qemu-devel@nongnu.org; Mon, 28 Aug 2017 11:41:53 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B1AEEAC6C; Mon, 28 Aug 2017 15:41:52 +0000 (UTC) From: Alexander Graf To: qemu-devel@nongnu.org Date: Mon, 28 Aug 2017 17:41:52 +0200 Message-Id: <20170828154152.15778-1-agraf@suse.de> X-Mailer: git-send-email 2.12.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 Subject: [Qemu-devel] [PATCH v3] console: add question-mark escape operator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Some termcaps (found using SLES11SP1) use [? sequences. According to man console_codes (http://linux.die.net/man/4/console_codes) the question mark is a nop and should simply be ignored. This patch does exactly that, rendering screen output readable when outputting guest serial consoles to the graphical console emulator. Signed-off-by: Alexander Graf --- v1 -> v2: - rebase to 2.10 v2 -> v3: - fix coding style issues --- ui/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.12.3 diff --git a/ui/console.c b/ui/console.c index d2d3534c49..37fee92001 100644 --- a/ui/console.c +++ b/ui/console.c @@ -880,8 +880,9 @@ static void console_putchar(QemuConsole *s, int ch) } else { if (s->nb_esc_params < MAX_ESC_PARAMS) s->nb_esc_params++; - if (ch == ';') + if (ch == ';' || ch == '?') { break; + } trace_console_putchar_csi(s->esc_params[0], s->esc_params[1], ch, s->nb_esc_params); s->state = TTY_STATE_NORM;