From patchwork Tue Sep 3 18:10:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Austin X-Patchwork-Id: 2853366 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D00DCC0AB5 for ; Tue, 3 Sep 2013 18:11:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4B8C2045B for ; Tue, 3 Sep 2013 18:11:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 830BE20172 for ; Tue, 3 Sep 2013 18:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760320Ab3ICSLp (ORCPT ); Tue, 3 Sep 2013 14:11:45 -0400 Received: from service87.mimecast.com ([91.220.42.44]:40640 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760310Ab3ICSLn (ORCPT ); Tue, 3 Sep 2013 14:11:43 -0400 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 03 Sep 2013 19:11:42 +0100 Received: from e102895-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Tue, 3 Sep 2013 19:11:40 +0100 From: Jonathan Austin To: kvm@vger.kernel.org Cc: penberg@kernel.org, marc.zyngier@arm.com, will.deacon@arm.com, Matt.Evans@arm.com, Jonathan Austin Subject: [PATCH 1/3] kvm tools: use #define for maximum number of terminal devices Date: Tue, 3 Sep 2013 19:10:53 +0100 Message-Id: <1378231855-13834-2-git-send-email-jonathan.austin@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1378231855-13834-1-git-send-email-jonathan.austin@arm.com> References: <1378231855-13834-1-git-send-email-jonathan.austin@arm.com> X-OriginalArrivalTime: 03 Sep 2013 18:11:40.0208 (UTC) FILETIME=[098B5300:01CEA8D1] X-MC-Unique: 113090319114200201 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Though there may be no near-term plans to change the number of terminal devices in the future, using TERM_MAX_DEVS instead of '4' makes reading some of the loops over terminal devices clearer. This patch makes this substitution where required. Signed-off-by: Jonathan Austin --- tools/kvm/term.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/kvm/term.c b/tools/kvm/term.c index fa85e4a..ac9c7cc 100644 --- a/tools/kvm/term.c +++ b/tools/kvm/term.c @@ -16,13 +16,14 @@ #define TERM_FD_IN 0 #define TERM_FD_OUT 1 +#define TERM_MAX_DEVS 4 static struct termios orig_term; int term_escape_char = 0x01; /* ctrl-a is used for escape */ bool term_got_escape = false; -int term_fds[4][2]; +int term_fds[TERM_MAX_DEVS][2]; int term_getc(struct kvm *kvm, int term) { @@ -94,7 +95,7 @@ static void term_cleanup(void) { int i; - for (i = 0; i < 4; i++) + for (i = 0; i < TERM_MAX_DEVS; i++) tcsetattr(term_fds[i][TERM_FD_IN], TCSANOW, &orig_term); } @@ -140,7 +141,7 @@ int term_init(struct kvm *kvm) struct termios term; int i, r; - for (i = 0; i < 4; i++) + for (i = 0; i < TERM_MAX_DEVS; i++) if (term_fds[i][TERM_FD_IN] == 0) { term_fds[i][TERM_FD_IN] = STDIN_FILENO; term_fds[i][TERM_FD_OUT] = STDOUT_FILENO;