Skip to content

Commit

Permalink
Merge remote-tracking branch 'amit/char-remove-watch-on-unplug' into …
Browse files Browse the repository at this point in the history 
…staging

# By Amit Shah
# Via Amit Shah
* amit/char-remove-watch-on-unplug:
  char: remove watch callback on chardev detach from frontend
  char: use common function to disable callbacks on chardev close
  char: move backends' io watch tag to CharDriverState

Message-id: [email protected]
Signed-off-by: Anthony Liguori <[email protected]>
  • Loading branch information
Anthony Liguori committed Oct 10, 2013
2 parents 88b70e5 + 386a5a1 commit e8f2f59
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 51 deletions.
1 change: 1 addition & 0 deletions include/sysemu/char.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct CharDriverState {
int explicit_be_open;
int avail_connections;
int is_mux;
guint fd_in_tag;
QemuOpts *opts;
QTAILQ_ENTRY(CharDriverState) next;
};
Expand Down
82 changes: 31 additions & 51 deletions qemu-char.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ void qemu_chr_fe_printf(CharDriverState *s, const char *fmt, ...)
va_end(ap);
}

static void remove_fd_in_watch(CharDriverState *chr);

void qemu_chr_add_handlers(CharDriverState *s,
IOCanReadHandler *fd_can_read,
IOReadHandler *fd_read,
Expand All @@ -203,6 +205,7 @@ void qemu_chr_add_handlers(CharDriverState *s,

if (!opaque && !fd_can_read && !fd_read && !fd_event) {
fe_open = 0;
remove_fd_in_watch(s);
} else {
fe_open = 1;
}
Expand Down Expand Up @@ -725,6 +728,14 @@ static void io_remove_watch_poll(guint tag)
g_source_destroy(&iwp->parent);
}

static void remove_fd_in_watch(CharDriverState *chr)
{
if (chr->fd_in_tag) {
io_remove_watch_poll(chr->fd_in_tag);
chr->fd_in_tag = 0;
}
}

#ifndef _WIN32
static GIOChannel *io_channel_from_fd(int fd)
{
Expand Down Expand Up @@ -798,7 +809,6 @@ static int io_channel_send(GIOChannel *fd, const void *buf, size_t len)
typedef struct FDCharDriver {
CharDriverState *chr;
GIOChannel *fd_in, *fd_out;
guint fd_in_tag;
int max_size;
QTAILQ_ENTRY(FDCharDriver) node;
} FDCharDriver;
Expand Down Expand Up @@ -830,10 +840,7 @@ static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
status = g_io_channel_read_chars(chan, (gchar *)buf,
len, &bytes_read, NULL);
if (status == G_IO_STATUS_EOF) {
if (s->fd_in_tag) {
io_remove_watch_poll(s->fd_in_tag);
s->fd_in_tag = 0;
}
remove_fd_in_watch(chr);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
return FALSE;
}
Expand Down Expand Up @@ -863,25 +870,18 @@ static void fd_chr_update_read_handler(CharDriverState *chr)
{
FDCharDriver *s = chr->opaque;

if (s->fd_in_tag) {
io_remove_watch_poll(s->fd_in_tag);
s->fd_in_tag = 0;
}

remove_fd_in_watch(chr);
if (s->fd_in) {
s->fd_in_tag = io_add_watch_poll(s->fd_in, fd_chr_read_poll, fd_chr_read, chr);
chr->fd_in_tag = io_add_watch_poll(s->fd_in, fd_chr_read_poll,
fd_chr_read, chr);
}
}

static void fd_chr_close(struct CharDriverState *chr)
{
FDCharDriver *s = chr->opaque;

if (s->fd_in_tag) {
io_remove_watch_poll(s->fd_in_tag);
s->fd_in_tag = 0;
}

remove_fd_in_watch(chr);
if (s->fd_in) {
g_io_channel_unref(s->fd_in);
}
Expand Down Expand Up @@ -1012,7 +1012,6 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)

typedef struct {
GIOChannel *fd;
guint fd_tag;
int connected;
int read_bytes;
guint timer_tag;
Expand Down Expand Up @@ -1123,10 +1122,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
PtyCharDriver *s = chr->opaque;

if (!connected) {
if (s->fd_tag) {
io_remove_watch_poll(s->fd_tag);
s->fd_tag = 0;
}
remove_fd_in_watch(chr);
s->connected = 0;
/* (re-)connect poll interval for idle guests: once per second.
* We check more frequently in case the guests sends data to
Expand All @@ -1140,7 +1136,8 @@ static void pty_chr_state(CharDriverState *chr, int connected)
if (!s->connected) {
s->connected = 1;
qemu_chr_be_generic_open(chr);
s->fd_tag = io_add_watch_poll(s->fd, pty_chr_read_poll, pty_chr_read, chr);
chr->fd_in_tag = io_add_watch_poll(s->fd, pty_chr_read_poll,
pty_chr_read, chr);
}
}
}
Expand All @@ -1151,10 +1148,7 @@ static void pty_chr_close(struct CharDriverState *chr)
PtyCharDriver *s = chr->opaque;
int fd;

if (s->fd_tag) {
io_remove_watch_poll(s->fd_tag);
s->fd_tag = 0;
}
remove_fd_in_watch(chr);
fd = g_io_channel_unix_get_fd(s->fd);
g_io_channel_unref(s->fd);
close(fd);
Expand Down Expand Up @@ -2161,7 +2155,6 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
typedef struct {
int fd;
GIOChannel *chan;
guint tag;
uint8_t buf[READ_BUF_LEN];
int bufcnt;
int bufptr;
Expand Down Expand Up @@ -2217,10 +2210,7 @@ static gboolean udp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
s->bufcnt = bytes_read;
s->bufptr = s->bufcnt;
if (status != G_IO_STATUS_NORMAL) {
if (s->tag) {
io_remove_watch_poll(s->tag);
s->tag = 0;
}
remove_fd_in_watch(chr);
return FALSE;
}

Expand All @@ -2238,23 +2228,18 @@ static void udp_chr_update_read_handler(CharDriverState *chr)
{
NetCharDriver *s = chr->opaque;

if (s->tag) {
io_remove_watch_poll(s->tag);
s->tag = 0;
}

remove_fd_in_watch(chr);
if (s->chan) {
s->tag = io_add_watch_poll(s->chan, udp_chr_read_poll, udp_chr_read, chr);
chr->fd_in_tag = io_add_watch_poll(s->chan, udp_chr_read_poll,
udp_chr_read, chr);
}
}

static void udp_chr_close(CharDriverState *chr)
{
NetCharDriver *s = chr->opaque;
if (s->tag) {
io_remove_watch_poll(s->tag);
s->tag = 0;
}

remove_fd_in_watch(chr);
if (s->chan) {
g_io_channel_unref(s->chan);
closesocket(s->fd);
Expand Down Expand Up @@ -2304,7 +2289,7 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
typedef struct {

GIOChannel *chan, *listen_chan;
guint tag, listen_tag;
guint listen_tag;
int fd, listen_fd;
int connected;
int max_size;
Expand Down Expand Up @@ -2489,10 +2474,7 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
if (s->listen_chan) {
s->listen_tag = g_io_add_watch(s->listen_chan, G_IO_IN, tcp_chr_accept, chr);
}
if (s->tag) {
io_remove_watch_poll(s->tag);
s->tag = 0;
}
remove_fd_in_watch(chr);
g_io_channel_unref(s->chan);
s->chan = NULL;
closesocket(s->fd);
Expand Down Expand Up @@ -2522,7 +2504,8 @@ static void tcp_chr_connect(void *opaque)

s->connected = 1;
if (s->chan) {
s->tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr);
chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll,
tcp_chr_read, chr);
}
qemu_chr_be_generic_open(chr);
}
Expand Down Expand Up @@ -2605,10 +2588,7 @@ static void tcp_chr_close(CharDriverState *chr)
{
TCPCharDriver *s = chr->opaque;
if (s->fd >= 0) {
if (s->tag) {
io_remove_watch_poll(s->tag);
s->tag = 0;
}
remove_fd_in_watch(chr);
if (s->chan) {
g_io_channel_unref(s->chan);
}
Expand Down

0 comments on commit e8f2f59

Please sign in to comment.