diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-12-12 16:39:35 +0300 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-31 23:31:20 +0400 |
| commit | f612143a033a2373c17fa5bfa73c611c17092cc0 (patch) | |
| tree | d36361ee9b01f3cfcd10da3cb2bd43c7a64de5ec | |
| parent | bf51f62869f4f7623e66b8e2b9f138687575330d (diff) | |
| download | focaccia-qemu-f612143a033a2373c17fa5bfa73c611c17092cc0.tar.gz focaccia-qemu-f612143a033a2373c17fa5bfa73c611c17092cc0.zip | |
char: rename and move to header CHR_READ_BUF_LEN
This define is used by several character devices, place it in char common header. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | chardev/char.c | 13 | ||||
| -rw-r--r-- | include/sysemu/char.h | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chardev/char.c b/chardev/char.c index 6b505c6f7d..6d0d5e722b 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -87,7 +87,6 @@ #include "char-mux.h" -#define READ_BUF_LEN 4096 #define READ_RETRIES 10 #define TCP_MAX_FDS 16 @@ -471,7 +470,7 @@ void qemu_chr_fe_accept_input(CharBackend *be) void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...) { - char buf[READ_BUF_LEN]; + char buf[CHR_READ_BUF_LEN]; va_list ap; va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); @@ -913,7 +912,7 @@ static gboolean fd_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) Chardev *chr = CHARDEV(opaque); FDChardev *s = FD_CHARDEV(opaque); int len; - uint8_t buf[READ_BUF_LEN]; + uint8_t buf[CHR_READ_BUF_LEN]; ssize_t ret; len = sizeof(buf); @@ -1265,7 +1264,7 @@ static gboolean pty_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) Chardev *chr = CHARDEV(opaque); PtyChardev *s = PTY_CHARDEV(opaque); gsize len; - uint8_t buf[READ_BUF_LEN]; + uint8_t buf[CHR_READ_BUF_LEN]; ssize_t ret; len = sizeof(buf); @@ -1952,7 +1951,7 @@ static void win_chr_readfile(Chardev *chr) WinChardev *s = WIN_CHARDEV(chr); int ret, err; - uint8_t buf[READ_BUF_LEN]; + uint8_t buf[CHR_READ_BUF_LEN]; DWORD size; ZeroMemory(&s->orecv, sizeof(s->orecv)); @@ -2354,7 +2353,7 @@ err1: typedef struct { Chardev parent; QIOChannel *ioc; - uint8_t buf[READ_BUF_LEN]; + uint8_t buf[CHR_READ_BUF_LEN]; int bufcnt; int bufptr; int max_size; @@ -2759,7 +2758,7 @@ static gboolean tcp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) { Chardev *chr = CHARDEV(opaque); SocketChardev *s = SOCKET_CHARDEV(opaque); - uint8_t buf[READ_BUF_LEN]; + uint8_t buf[CHR_READ_BUF_LEN]; int len, size; if (!s->connected || s->max_size <= 0) { diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 1e1f5c7b2b..1a65798e3e 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -22,6 +22,7 @@ typedef enum { CHR_EVENT_CLOSED /* connection closed */ } QEMUChrEvent; +#define CHR_READ_BUF_LEN 4096 #define CHR_IOCTL_SERIAL_SET_PARAMS 1 typedef struct { |