[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] char-win: close file handle except with consol
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 06/15] char-win: close file handle except with console |
Date: |
Fri, 2 Jun 2017 11:40:31 +0400 |
Only the console handle shouldn't be closed, however, the "file" handle
should.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
chardev/char-win.h | 5 ++---
chardev/char-console.c | 2 +-
chardev/char-file.c | 2 +-
chardev/char-win.c | 12 ++++--------
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/chardev/char-win.h b/chardev/char-win.h
index 888be2b3ca..4994425e9e 100644
--- a/chardev/char-win.h
+++ b/chardev/char-win.h
@@ -29,14 +29,13 @@
typedef struct {
Chardev parent;
+ bool keep_open; /* console do not close file */
HANDLE file, hrecv, hsend;
OVERLAPPED orecv;
BOOL fpipe;
/* Protected by the Chardev chr_write_lock. */
OVERLAPPED osend;
- /* FIXME: file/console do not finalize */
- bool skip_free;
} WinChardev;
#define NSENDBUF 2048
@@ -45,7 +44,7 @@ typedef struct {
#define TYPE_CHARDEV_WIN "chardev-win"
#define WIN_CHARDEV(obj) OBJECT_CHECK(WinChardev, (obj), TYPE_CHARDEV_WIN)
-void qemu_chr_open_win_file(Chardev *chr, HANDLE fd_out);
+void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open);
int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp);
int win_chr_pipe_poll(void *opaque);
diff --git a/chardev/char-console.c b/chardev/char-console.c
index c824937fe6..8d972c1506 100644
--- a/chardev/char-console.c
+++ b/chardev/char-console.c
@@ -29,7 +29,7 @@ static void qemu_chr_open_win_con(Chardev *chr,
bool *be_opened,
Error **errp)
{
- qemu_chr_open_win_file(chr, GetStdHandle(STD_OUTPUT_HANDLE));
+ win_chr_set_file(chr, GetStdHandle(STD_OUTPUT_HANDLE), true);
}
static void char_console_class_init(ObjectClass *oc, void *data)
diff --git a/chardev/char-file.c b/chardev/char-file.c
index 8bae25350d..aed4ae1569 100644
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -65,7 +65,7 @@ static void qmp_chardev_open_file(Chardev *chr,
return;
}
- qemu_chr_open_win_file(chr, out);
+ win_chr_set_file(chr, out, false);
#else
int flags, in = -1, out;
diff --git a/chardev/char-win.c b/chardev/char-win.c
index a7e3296909..ec9a731be9 100644
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -192,17 +192,13 @@ static void char_win_finalize(Object *obj)
Chardev *chr = CHARDEV(obj);
WinChardev *s = WIN_CHARDEV(chr);
- if (s->skip_free) {
- return;
- }
-
if (s->hsend) {
CloseHandle(s->hsend);
}
if (s->hrecv) {
CloseHandle(s->hrecv);
}
- if (s->file) {
+ if (!s->keep_open && s->file) {
CloseHandle(s->file);
}
if (s->fpipe) {
@@ -214,12 +210,12 @@ static void char_win_finalize(Object *obj)
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
}
-void qemu_chr_open_win_file(Chardev *chr, HANDLE fd_out)
+void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open)
{
WinChardev *s = WIN_CHARDEV(chr);
- s->skip_free = true;
- s->file = fd_out;
+ s->keep_open = keep_open;
+ s->file = file;
}
static void char_win_class_init(ObjectClass *oc, void *data)
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PULL 00/15] chardev patches, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 01/15] char: cast ARRAY_SIZE() as signed to silent warning on empty array, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 02/15] char-win: simplify win_chr_read(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 03/15] char-win: remove WinChardev.len, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 04/15] char-win: rename win_chr_init/poll win_chr_serial_init/poll, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 05/15] char-win: rename hcom->file, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 06/15] char-win: close file handle except with console,
Marc-André Lureau <=
- [Qemu-devel] [PULL 07/15] Remove/replace sysemu/char.h inclusion, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 08/15] chardev: move headers to include/chardev, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 09/15] chardev: serial & parallel declaration to own headers, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 10/15] be-hci: use backend functions, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 11/15] char: generalize qemu_chr_write_all(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 12/15] char: move CharBackend handling in char-fe unit, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 13/15] char: rename functions that are not part of fe, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 14/15] char: make chr_fe_deinit() optionaly delete backend, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PULL 15/15] char: move char devices to chardev/, Marc-André Lureau, 2017/06/02
- Re: [Qemu-devel] [PULL 00/15] chardev patches, Peter Maydell, 2017/06/02