Merge branch 'master' into oci

Signed-off-by: James Hunt <james.o.hunt@intel.com>
This commit is contained in:
James Hunt
2015-11-05 09:52:17 +00:00
10 changed files with 146 additions and 61 deletions
-3
View File
@@ -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 */