aboutsummaryrefslogtreecommitdiff
path: root/chardev
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2017-09-21 14:35:54 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2017-09-22 21:07:27 +0200
commitbb86d05f4afab3ebfee2e897e295d61dbd8cc28e (patch)
treeee0c77875cfa2b30bb1db7a17563560b17153ad4 /chardev
parent6bbb6c0644f76b58012bd7ed4279d44c59bb43ab (diff)
chardev: remove context in chr_update_read_handler
We had a per-chardev cache for context, then we don't need this parameter to be passed in every time when chr_update_read_handler() called. As long as we are calling chr_update_read_handler() using qemu_chr_be_update_read_handlers() we'll be fine. Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <1505975754-21555-5-git-send-email-peterx@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'chardev')
-rw-r--r--chardev/char-fd.c3
-rw-r--r--chardev/char-pty.c3
-rw-r--r--chardev/char-socket.c3
-rw-r--r--chardev/char-udp.c3
-rw-r--r--chardev/char.c2
5 files changed, 5 insertions, 9 deletions
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 09fbb078af..2c9b2ce567 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -84,8 +84,7 @@ static GSource *fd_chr_add_watch(Chardev *chr, GIOCondition cond)
return qio_channel_create_watch(s->ioc_out, cond);
}
-static void fd_chr_update_read_handler(Chardev *chr,
- GMainContext *context)
+static void fd_chr_update_read_handler(Chardev *chr)
{
FDChardev *s = FD_CHARDEV(chr);
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index d239c04bc3..761ae6dec1 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -112,8 +112,7 @@ static void pty_chr_update_read_handler_locked(Chardev *chr)
}
}
-static void pty_chr_update_read_handler(Chardev *chr,
- GMainContext *context)
+static void pty_chr_update_read_handler(Chardev *chr)
{
qemu_mutex_lock(&chr->chr_write_lock);
pty_chr_update_read_handler_locked(chr);
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index ee71cbed5b..e65148fe97 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -521,8 +521,7 @@ static void tcp_chr_connect(void *opaque)
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
-static void tcp_chr_update_read_handler(Chardev *chr,
- GMainContext *context)
+static void tcp_chr_update_read_handler(Chardev *chr)
{
SocketChardev *s = SOCKET_CHARDEV(chr);
diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index 106dee1a29..d46ff7ab53 100644
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -100,8 +100,7 @@ static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
return TRUE;
}
-static void udp_chr_update_read_handler(Chardev *chr,
- GMainContext *context)
+static void udp_chr_update_read_handler(Chardev *chr)
{
UdpChardev *s = UDP_CHARDEV(chr);
diff --git a/chardev/char.c b/chardev/char.c
index 89eabea5ac..2ae4f465ec 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -187,7 +187,7 @@ void qemu_chr_be_update_read_handlers(Chardev *s,
s->gcontext = context;
if (cc->chr_update_read_handler) {
- cc->chr_update_read_handler(s, context);
+ cc->chr_update_read_handler(s);
}
}