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

char-win: simplify win_chr_read()

Browse Source 
win_chr_read_poll() is always used before win_chr_read().
We can easily fold win_chr_readfile() too.

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 19:37:19 +01:00
parent c7e47c63e0
commit b88ee02594
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
chardev/char-win.c
View File

@ -26,14 +26,21 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "char-win.h" #include "char-win.h"
static void win_chr_readfile(Chardev *chr) static void win_chr_read(Chardev *chr)
{ {
WinChardev *s = WIN_CHARDEV(chr); WinChardev *s = WIN_CHARDEV(chr);
int max_size = qemu_chr_be_can_write(chr);
int ret, err; int ret, err;
uint8_t buf[CHR_READ_BUF_LEN]; uint8_t buf[CHR_READ_BUF_LEN];
DWORD size; DWORD size;
if (s->len > max_size) {
s->len = max_size;
}
if (s->len == 0) {
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, s->len, &size, &s->orecv);
@ -49,28 +56,6 @@ static void win_chr_readfile(Chardev *chr)
} }
} }
static void win_chr_read(Chardev *chr)
{
WinChardev *s = WIN_CHARDEV(chr);
if (s->len > s->max_size) {
s->len = s->max_size;
}
if (s->len == 0) {
return;
}
win_chr_readfile(chr);
}
static int win_chr_read_poll(Chardev *chr)
{
WinChardev *s = WIN_CHARDEV(chr);
s->max_size = qemu_chr_be_can_write(chr);
return s->max_size;
}
static int win_chr_poll(void *opaque) static int win_chr_poll(void *opaque)
{ {
Chardev *chr = CHARDEV(opaque); Chardev *chr = CHARDEV(opaque);
@ -81,7 +66,6 @@ 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; s->len = status.cbInQue;
win_chr_read_poll(chr);
win_chr_read(chr); win_chr_read(chr);
return 1; return 1;
} }
@ -163,7 +147,6 @@ 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; s->len = size;
win_chr_read_poll(chr);
win_chr_read(chr); win_chr_read(chr);
return 1; return 1;
} }

2
chardev/char-win.h
View File

@ -28,7 +28,7 @@
typedef struct { typedef struct {
Chardev parent; Chardev parent;
int max_size;
HANDLE hcom, hrecv, hsend; HANDLE hcom, hrecv, hsend;
OVERLAPPED orecv; OVERLAPPED orecv;
BOOL fpipe; BOOL fpipe;