From 7787f0ffbbe1e54988756a1ec9fc643407a461ec Mon Sep 17 00:00:00 2001 From: Jonathan Austin Date: Wed, 11 Sep 2013 18:32:47 +0100 Subject: [PATCH] kvm tools: use #define for maximum number of terminal devices 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 the this substitution where required. Signed-off-by: Jonathan Austin Acked-by: Marc Zyngier Signed-off-by: Pekka Enberg --- term.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/term.c b/term.c index fa85e4a..ac9c7cc 100644 --- a/term.c +++ b/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;