diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index d5ba483f1e..bd2f425214 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,8 +79,7 @@ static void vuart_print_char(struct vcpu *v, char c) struct domain *d = v->domain; struct vuart *uart = &d->arch.vuart; - /* Accept only printable characters, newline, and horizontal tab. */ - if ( !isprint(c) && (c != '\n') && (c != '\t') ) + if ( !is_console_printable(c) ) return ; spin_lock(&uart->lock); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0f0630769b..4851e2e150 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -7,7 +7,6 @@ * Copyright (c) 2008, Citrix Systems, Inc. */ -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -561,8 +561,7 @@ static int cf_check hvm_print_line( if ( dir != IOREQ_WRITE ) return X86EMUL_UNHANDLEABLE; - /* Accept only printable characters, newline, and horizontal tab. */ - if ( !isprint(c) && (c != '\n') && (c != '\t') ) + if ( !is_console_printable(c) ) return X86EMUL_OKAY; spin_lock(&cd->pbuf_lock); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2926c97df9..7adf4e11fc 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include /* for do_console_io */ @@ -674,7 +673,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, c = *kin++; if ( c == '\n' ) break; - if ( isprint(c) || c == '\t' ) + if ( is_console_printable(c) ) *kout++ = c; } while ( --kcount > 0 ); diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 6dfbade3ec..c4650231be 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -8,6 +8,7 @@ #define __CONSOLE_H__ #include +#include #include struct xen_sysctl_readconsole; @@ -50,4 +51,9 @@ void console_serial_puts(const char *s, size_t nr); extern int8_t opt_console_xen; +static inline bool is_console_printable(unsigned char c) +{ + return isprint(c) || c == '\n' || c == '\t'; +} + #endif /* __CONSOLE_H__ */