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 <jonathan.austin@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Jonathan Austin
2013-09-11 18:32:47 +01:00
committed by Will Deacon
parent 27347f76ac
commit 7787f0ffbb
+4 -3
View File
@@ -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;