diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-04 20:03:08 +0100 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-06-02 11:33:52 +0400 |
commit | 6ce8e0eb587782e26a05a57134529cc598febd56 (patch) | |
tree | 91a542f2b4a01a0299b6e0b585066f199afd0079 /chardev/char-win.c | |
parent | b88ee025942d1ed67232700ef8befa5e52a9f7bd (diff) |
char-win: remove WinChardev.len
The "len" argument can be passed directly to win_chr_read()
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'chardev/char-win.c')
-rw-r--r-- | chardev/char-win.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chardev/char-win.c b/chardev/char-win.c index a46d878ef8..5e7daeeae1 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "char-win.h" -static void win_chr_read(Chardev *chr) +static void win_chr_read(Chardev *chr, DWORD len) { WinChardev *s = WIN_CHARDEV(chr); int max_size = qemu_chr_be_can_write(chr); @@ -34,16 +34,16 @@ static void win_chr_read(Chardev *chr) uint8_t buf[CHR_READ_BUF_LEN]; DWORD size; - if (s->len > max_size) { - s->len = max_size; + if (len > max_size) { + len = max_size; } - if (s->len == 0) { + if (len == 0) { return; } ZeroMemory(&s->orecv, sizeof(s->orecv)); s->orecv.hEvent = s->hrecv; - ret = ReadFile(s->hcom, buf, s->len, &size, &s->orecv); + ret = ReadFile(s->hcom, buf, len, &size, &s->orecv); if (!ret) { err = GetLastError(); if (err == ERROR_IO_PENDING) { @@ -65,8 +65,7 @@ static int win_chr_poll(void *opaque) ClearCommError(s->hcom, &comerr, &status); if (status.cbInQue > 0) { - s->len = status.cbInQue; - win_chr_read(chr); + win_chr_read(chr, status.cbInQue); return 1; } return 0; @@ -146,8 +145,7 @@ int win_chr_pipe_poll(void *opaque) PeekNamedPipe(s->hcom, NULL, 0, NULL, &size, NULL); if (size > 0) { - s->len = size; - win_chr_read(chr); + win_chr_read(chr, size); return 1; } return 0; |