aboutsummaryrefslogtreecommitdiff
path: root/chardev/char-win.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-01-04 19:37:19 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2017-06-02 11:33:52 +0400
commitb88ee025942d1ed67232700ef8befa5e52a9f7bd (patch)
tree4310041b776929abc51c7dca9d640778a8383326 /chardev/char-win.c
parentc7e47c63e0362ffded57db38684b88c270cff65f (diff)
char-win: simplify win_chr_read()
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>
Diffstat (limited to 'chardev/char-win.c')
-rw-r--r--chardev/char-win.c35
1 files changed, 9 insertions, 26 deletions
diff --git a/chardev/char-win.c b/chardev/char-win.c
index e4b6957ded..a46d878ef8 100644
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -26,14 +26,21 @@
#include "qapi/error.h"
#include "char-win.h"
-static void win_chr_readfile(Chardev *chr)
+static void win_chr_read(Chardev *chr)
{
WinChardev *s = WIN_CHARDEV(chr);
-
+ int max_size = qemu_chr_be_can_write(chr);
int ret, err;
uint8_t buf[CHR_READ_BUF_LEN];
DWORD size;
+ if (s->len > max_size) {
+ s->len = max_size;
+ }
+ if (s->len == 0) {
+ return;
+ }
+
ZeroMemory(&s->orecv, sizeof(s->orecv));
s->orecv.hEvent = s->hrecv;
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)
{
Chardev *chr = CHARDEV(opaque);
@@ -81,7 +66,6 @@ static int win_chr_poll(void *opaque)
ClearCommError(s->hcom, &comerr, &status);
if (status.cbInQue > 0) {
s->len = status.cbInQue;
- win_chr_read_poll(chr);
win_chr_read(chr);
return 1;
}
@@ -163,7 +147,6 @@ int win_chr_pipe_poll(void *opaque)
PeekNamedPipe(s->hcom, NULL, 0, NULL, &size, NULL);
if (size > 0) {
s->len = size;
- win_chr_read_poll(chr);
win_chr_read(chr);
return 1;
}