Commit bb86d05f authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

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: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1505975754-21555-5-git-send-email-peterx@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6bbb6c06

chardev/char-fd.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

chardev/char-pty.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

chardev/char-socket.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

chardev/char-udp.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

chardev/char.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

}