From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleg Nesterov Subject: [PATCH] kvmtool/term: unexport term_set_tty, term_init, term_exit Date: Mon, 19 Oct 2015 16:28:53 +0200 Message-ID: <20151019142853.GA21583@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org To: Pekka Enberg , Sasha Levin , Will Deacon Return-path: Received: from mx1.redhat.com ([209.132.183.28]:11767 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752519AbbJSOcY (ORCPT ); Mon, 19 Oct 2015 10:32:24 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: According to git grep they can be static. term_got_escape can be static too, and we can even move it into term_getc(). "int term_escape_char" doesn't make sense at least until we allow to redefine it, turn it into preprocessor constant. Signed-off-by: Oleg Nesterov --- include/kvm/term.h | 3 --- term.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/kvm/term.h b/include/kvm/term.h index dc9882e..b9793f0 100644 --- a/include/kvm/term.h +++ b/include/kvm/term.h @@ -18,9 +18,6 @@ int term_putc(char *addr, int cnt, int term); int term_getc(struct kvm *kvm, int term); bool term_readable(int term); -void term_set_tty(int term); -int term_init(struct kvm *kvm); -int term_exit(struct kvm *kvm); int tty_parser(const struct option *opt, const char *arg, int unset); #endif /* KVM__TERM_H */ diff --git a/term.c b/term.c index 9763211..aebd174 100644 --- a/term.c +++ b/term.c @@ -19,15 +19,16 @@ static struct termios orig_term; -int term_escape_char = 0x01; /* ctrl-a is used for escape */ -bool term_got_escape = false; - -int term_fds[TERM_MAX_DEVS][2]; +static int term_fds[TERM_MAX_DEVS][2]; static pthread_t term_poll_thread; +/* ctrl-a is used for escape */ +#define term_escape_char 0x01 + int term_getc(struct kvm *kvm, int term) { + static bool term_got_escape = false; unsigned char c; if (read_in_full(term_fds[term][TERM_FD_IN], &c, 1) < 0) @@ -137,7 +138,7 @@ static void term_sig_cleanup(int sig) raise(sig); } -void term_set_tty(int term) +static void term_set_tty(int term) { struct termios orig_term; int master, slave; @@ -167,7 +168,7 @@ int tty_parser(const struct option *opt, const char *arg, int unset) return 0; } -int term_init(struct kvm *kvm) +static int term_init(struct kvm *kvm) { struct termios term; int i, r; @@ -204,7 +205,7 @@ int term_init(struct kvm *kvm) } dev_init(term_init); -int term_exit(struct kvm *kvm) +static int term_exit(struct kvm *kvm) { return 0; } -- 2.4.3