From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH 01/32] char: move backends' io watch tag to CharDriverState
Date: Wed, 4 Dec 2013 08:34:08 -0600 [thread overview]
Message-ID: <1386167679-13021-2-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1386167679-13021-1-git-send-email-mdroth@linux.vnet.ibm.com>
From: Amit Shah <amit.shah@redhat.com>
All the backends implement an io watcher tag for callbacks. Move it to
CharDriverState from each backend's struct to make accessing the tag from
backend-neutral functions easier.
This will be used later to cancel a callback on chardev detach from a
frontend.
CC: <qemu-stable@nongnu.org>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
(cherry picked from commit 7ba9addc165b37b764baa08c02518b15b2361707)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
include/sysemu/char.h | 1 +
qemu-char.c | 77 +++++++++++++++++++++++++------------------------
2 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 8053130..ad101d9 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -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;
};
diff --git a/qemu-char.c b/qemu-char.c
index 1621fbd..1dc1646 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -798,7 +798,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;
@@ -830,9 +829,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
return FALSE;
@@ -863,13 +862,14 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
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);
}
}
@@ -877,9 +877,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
if (s->fd_in) {
@@ -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;
@@ -1123,9 +1122,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
s->connected = 0;
/* (re-)connect poll interval for idle guests: once per second.
@@ -1140,7 +1139,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);
}
}
}
@@ -1151,9 +1151,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
fd = g_io_channel_unix_get_fd(s->fd);
g_io_channel_unref(s->fd);
@@ -2161,7 +2161,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;
@@ -2217,9 +2216,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
return FALSE;
}
@@ -2238,22 +2237,23 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
if (s->chan) {
g_io_channel_unref(s->chan);
@@ -2304,7 +2304,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;
@@ -2489,9 +2489,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
g_io_channel_unref(s->chan);
s->chan = NULL;
@@ -2522,7 +2522,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);
}
@@ -2605,9 +2606,9 @@ 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;
+ if (chr->fd_in_tag) {
+ io_remove_watch_poll(chr->fd_in_tag);
+ chr->fd_in_tag = 0;
}
if (s->chan) {
g_io_channel_unref(s->chan);
--
1.7.9.5
next prev parent reply other threads:[~2013-12-04 14:35 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 14:34 [Qemu-devel] Patch Round-up for stable 1.6.2, freeze on 2013-12-06 Michael Roth
2013-12-04 14:34 ` Michael Roth [this message]
2013-12-04 14:34 ` [Qemu-devel] [PATCH 02/32] char: use common function to disable callbacks on chardev close Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 03/32] char: remove watch callback on chardev detach from frontend Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 04/32] tests: Fix schema parser test for in-tree build Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 05/32] tests: Update .gitignore for test-int128 and test-bitops Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 06/32] tci: Add implementation of rotl_i64, rotr_i64 Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 07/32] bitops: Add rotate functions (rol8, ror8, ...) Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 08/32] misc: Use new rotate functions Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 09/32] qemu-char: Fix potential out of bounds access to local arrays Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 10/32] xen_disk: mark ioreq as mapped before unmapping in error case Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 11/32] vmdk: Fix vmdk_parse_extents Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 12/32] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 13/32] monitor: eliminate monitor_event_state_lock Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 14/32] memory: fix 128 arithmetic in info mtree Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 15/32] Adjust qapi-visit for python-2.4.3 Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 16/32] configure: detect endian via compile test Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 17/32] qapi: fix memleak by adding implict struct functions in dealloc visitor Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 18/32] tests: fix memleak in error path test for input visitor Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 19/32] configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0 Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 20/32] linux-user: Fix stat64 syscall for SPARC64 Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 21/32] virtio-net: only delete bh that existed Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 22/32] exec: fix breakpoint_invalidate when pc may not be translated Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 23/32] Fix pc migration from qemu <= 1.5 Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 24/32] qcow2: count_contiguous_clusters and compression Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 25/32] qcow2: fix possible corruption when reading multiple clusters Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 26/32] vfio-pci: Fix multifunction=on Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 27/32] virtio-net: fix the memory leak in rxfilter_notify() Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 28/32] qom: Fix memory leak in object_property_set_link() Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 29/32] qdev-monitor: Fix crash when device_add is called with abstract driver Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 30/32] qdev-monitor: Unref device when device_add fails Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 31/32] pci: unregister vmstate_pcibus on unplug Michael Roth
2013-12-04 14:34 ` [Qemu-devel] [PATCH 32/32] rng-egd: offset the point when repeatedly read from the buffer Michael Roth
2013-12-05 15:23 ` [Qemu-devel] Patch Round-up for stable 1.6.2, freeze on 2013-12-06 Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386167679-13021-2-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).