mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

char-win: remove WinChardev.len

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2017-01-04 20:03:08 +01:00
parent b88ee02594
commit 6ce8e0eb58
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chardev/char-win.c
View File

@ -26,7 +26,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "char-win.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); WinChardev *s = WIN_CHARDEV(chr);
int max_size = qemu_chr_be_can_write(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]; uint8_t buf[CHR_READ_BUF_LEN];
DWORD size; DWORD size;
if (s->len > max_size) { if (len > max_size) {
s->len = max_size; len = max_size;
} }
if (s->len == 0) { if (len == 0) {
return; return;
} }
ZeroMemory(&s->orecv, sizeof(s->orecv)); ZeroMemory(&s->orecv, sizeof(s->orecv));
s->orecv.hEvent = s->hrecv; 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) { if (!ret) {
err = GetLastError(); err = GetLastError();
if (err == ERROR_IO_PENDING) { if (err == ERROR_IO_PENDING) {
@ -65,8 +65,7 @@ static int win_chr_poll(void *opaque)
ClearCommError(s->hcom, &comerr, &status); ClearCommError(s->hcom, &comerr, &status);
if (status.cbInQue > 0) { if (status.cbInQue > 0) {
s->len = status.cbInQue; win_chr_read(chr, status.cbInQue);
win_chr_read(chr);
return 1; return 1;
} }
return 0; return 0;
@ -146,8 +145,7 @@ int win_chr_pipe_poll(void *opaque)
PeekNamedPipe(s->hcom, NULL, 0, NULL, &size, NULL); PeekNamedPipe(s->hcom, NULL, 0, NULL, &size, NULL);
if (size > 0) { if (size > 0) {
s->len = size; win_chr_read(chr, size);
win_chr_read(chr);
return 1; return 1;
} }
return 0; return 0;

1
chardev/char-win.h
View File

@ -32,7 +32,6 @@ typedef struct {
HANDLE hcom, hrecv, hsend; HANDLE hcom, hrecv, hsend;
OVERLAPPED orecv; OVERLAPPED orecv;
BOOL fpipe; BOOL fpipe;
DWORD len;
/* Protected by the Chardev chr_write_lock. */ /* Protected by the Chardev chr_write_lock. */
OVERLAPPED osend; OVERLAPPED osend;