[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/13] char-win: remove WinChardev.len
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 02/13] char-win: remove WinChardev.len |
Date: |
Tue, 9 May 2017 15:33:21 +0400 |
The "len" argument can be passed directly to win_chr_read()
Signed-off-by: Marc-André Lureau <address@hidden>
---
chardev/char-win.h | 1 -
chardev/char-win.c | 16 +++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/chardev/char-win.h b/chardev/char-win.h
index 73a0e3caef..70215e04c2 100644
--- a/chardev/char-win.h
+++ b/chardev/char-win.h
@@ -32,7 +32,6 @@ typedef struct {
HANDLE hcom, hrecv, hsend;
OVERLAPPED orecv;
BOOL fpipe;
- DWORD len;
/* Protected by the Chardev chr_write_lock. */
OVERLAPPED osend;
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;
--
2.13.0.rc1.16.gd80b50c3f
- [Qemu-devel] [PATCH 00/13] chardev: misc clean-ups, Marc-André Lureau, 2017/05/09
- [Qemu-devel] [PATCH 01/13] char-win: simplify win_chr_read(), Marc-André Lureau, 2017/05/09
- [Qemu-devel] [PATCH 02/13] char-win: remove WinChardev.len,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 03/13] char-win: rename win_chr_init/poll win_chr_serial_init/poll, Marc-André Lureau, 2017/05/09
- [Qemu-devel] [PATCH 04/13] char-win: rename hcom->file, Marc-André Lureau, 2017/05/09
- [Qemu-devel] [PATCH 05/13] char-win: close file handle except with console, Marc-André Lureau, 2017/05/09
- [Qemu-devel] [PATCH 06/13] chardev: move headers to include/chardev, Marc-André Lureau, 2017/05/09