falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

char-win: close file handle except with console 

Only the console handle shouldn't be closed, however, the "file" handle
should.

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 21:34:42 +01:00
parent ef0f272f38
commit 541815ff7f
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chardev/char-console.c
View File

@ -29,7 +29,7 @@ static void qemu_chr_open_win_con(Chardev *chr,
bool *be_opened, bool *be_opened,
Error **errp) 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) static void char_console_class_init(ObjectClass *oc, void *data)

2
chardev/char-file.c
View File

@ -65,7 +65,7 @@ static void qmp_chardev_open_file(Chardev *chr,
return; return;
} }
qemu_chr_open_win_file(chr, out); win_chr_set_file(chr, out, false);
#else #else
int flags, in = -1, out; int flags, in = -1, out;

12
chardev/char-win.c
View File

@ -192,17 +192,13 @@ static void char_win_finalize(Object *obj)
Chardev *chr = CHARDEV(obj); Chardev *chr = CHARDEV(obj);
WinChardev *s = WIN_CHARDEV(chr); WinChardev *s = WIN_CHARDEV(chr);
if (s->skip_free) {
return;
}
if (s->hsend) { if (s->hsend) {
CloseHandle(s->hsend); CloseHandle(s->hsend);
} }
if (s->hrecv) { if (s->hrecv) {
CloseHandle(s->hrecv); CloseHandle(s->hrecv);
} }
if (s->file) { if (!s->keep_open && s->file) {
CloseHandle(s->file); CloseHandle(s->file);
} }
if (s->fpipe) { if (s->fpipe) {
@ -214,12 +210,12 @@ static void char_win_finalize(Object *obj)
qemu_chr_be_event(chr, CHR_EVENT_CLOSED); 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); WinChardev *s = WIN_CHARDEV(chr);
s->skip_free = true; s->keep_open = keep_open;
s->file = fd_out; s->file = file;
} }
static void char_win_class_init(ObjectClass *oc, void *data) static void char_win_class_init(ObjectClass *oc, void *data)

5
chardev/char-win.h
View File

@ -29,14 +29,13 @@
typedef struct { typedef struct {
Chardev parent; Chardev parent;
bool keep_open; /* console do not close file */
HANDLE file, hrecv, hsend; HANDLE file, hrecv, hsend;
OVERLAPPED orecv; OVERLAPPED orecv;
BOOL fpipe; BOOL fpipe;
/* Protected by the Chardev chr_write_lock. */ /* Protected by the Chardev chr_write_lock. */
OVERLAPPED osend; OVERLAPPED osend;
/* FIXME: file/console do not finalize */
bool skip_free;
} WinChardev; } WinChardev;
#define NSENDBUF 2048 #define NSENDBUF 2048
@ -45,7 +44,7 @@ typedef struct {
#define TYPE_CHARDEV_WIN "chardev-win" #define TYPE_CHARDEV_WIN "chardev-win"
#define WIN_CHARDEV(obj) OBJECT_CHECK(WinChardev, (obj), TYPE_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_serial_init(Chardev *chr, const char *filename, Error **errp);
int win_chr_pipe_poll(void *opaque); int win_chr_pipe_poll(void *opaque);