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

char: Emit 'CLOSED' events on char device close

Browse Source 
Notify users of the char interface whenever the file / connection is
closed.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Amit Shah 2009-08-11 21:27:48 +05:30 committed by Anthony Liguori
parent 0b5c1ce846
commit 793cbfb5d1
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu-char.c
View File

@ -570,6 +570,7 @@ static void fd_chr_read(void *opaque)
if (size == 0) { if (size == 0) {
/* FD has been closed. Remove it from the active list. */ /* FD has been closed. Remove it from the active list. */
qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL); qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
return; return;
} }
if (size > 0) { if (size > 0) {
@ -602,6 +603,7 @@ static void fd_chr_close(struct CharDriverState *chr)
} }
qemu_free(s); qemu_free(s);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
/* open a character device to a unix fd */ /* open a character device to a unix fd */
@ -690,6 +692,7 @@ static void stdio_read(void *opaque)
if (size == 0) { if (size == 0) {
/* stdin has been closed. Remove it from the active list. */ /* stdin has been closed. Remove it from the active list. */
qemu_set_fd_handler2(0, NULL, NULL, NULL, NULL); qemu_set_fd_handler2(0, NULL, NULL, NULL, NULL);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
return; return;
} }
if (size > 0) { if (size > 0) {
@ -943,6 +946,7 @@ static void pty_chr_close(struct CharDriverState *chr)
qemu_del_timer(s->timer); qemu_del_timer(s->timer);
qemu_free_timer(s->timer); qemu_free_timer(s->timer);
qemu_free(s); qemu_free(s);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static CharDriverState *qemu_chr_open_pty(void) static CharDriverState *qemu_chr_open_pty(void)
@ -1264,6 +1268,7 @@ static void pp_close(CharDriverState *chr)
ioctl(fd, PPRELEASE); ioctl(fd, PPRELEASE);
close(fd); close(fd);
qemu_free(drv); qemu_free(drv);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static CharDriverState *qemu_chr_open_pp(const char *filename) static CharDriverState *qemu_chr_open_pp(const char *filename)
@ -1390,6 +1395,8 @@ static void win_chr_close(CharDriverState *chr)
qemu_del_polling_cb(win_chr_pipe_poll, chr); qemu_del_polling_cb(win_chr_pipe_poll, chr);
else else
qemu_del_polling_cb(win_chr_poll, chr); qemu_del_polling_cb(win_chr_poll, chr);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static int win_chr_init(CharDriverState *chr, const char *filename) static int win_chr_init(CharDriverState *chr, const char *filename)
@ -1779,6 +1786,7 @@ static void udp_chr_close(CharDriverState *chr)
closesocket(s->fd); closesocket(s->fd);
} }
qemu_free(s); qemu_free(s);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static CharDriverState *qemu_chr_open_udp(const char *def) static CharDriverState *qemu_chr_open_udp(const char *def)
@ -1999,6 +2007,7 @@ static void tcp_chr_read(void *opaque)
qemu_set_fd_handler(s->fd, NULL, NULL, NULL); qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
closesocket(s->fd); closesocket(s->fd);
s->fd = -1; s->fd = -1;
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} else if (size > 0) { } else if (size > 0) {
if (s->do_telnetopt) if (s->do_telnetopt)
tcp_chr_process_IAC_bytes(chr, s, buf, &size); tcp_chr_process_IAC_bytes(chr, s, buf, &size);
@ -2095,6 +2104,7 @@ static void tcp_chr_close(CharDriverState *chr)
closesocket(s->listen_fd); closesocket(s->listen_fd);
} }
qemu_free(s); qemu_free(s);
qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static CharDriverState *qemu_chr_open_tcp(const char *host_str, static CharDriverState *qemu_chr_open_tcp(const char *host_str,

1
qemu-char.h
View File

@ -11,6 +11,7 @@
#define CHR_EVENT_RESET 2 /* new connection established */ #define CHR_EVENT_RESET 2 /* new connection established */
#define CHR_EVENT_MUX_IN 3 /* mux-focus was set to this terminal */ #define CHR_EVENT_MUX_IN 3 /* mux-focus was set to this terminal */
#define CHR_EVENT_MUX_OUT 4 /* mux-focus will move on */ #define CHR_EVENT_MUX_OUT 4 /* mux-focus will move on */
#define CHR_EVENT_CLOSED 5 /* connection closed */
#define CHR_IOCTL_SERIAL_SET_PARAMS 1 #define CHR_IOCTL_SERIAL_SET_PARAMS 1