[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/40] qemu-char: move pty_chr_update_read_handler ar
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 37/40] qemu-char: move pty_chr_update_read_handler around |
Date: |
Thu, 19 Jun 2014 15:39:49 -0400 |
From: Paolo Bonzini <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-char.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 26994aa..9470ea2 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1055,6 +1055,22 @@ static void pty_chr_rearm_timer(CharDriverState *chr,
int ms)
}
}
+static void pty_chr_update_read_handler(CharDriverState *chr)
+{
+ PtyCharDriver *s = chr->opaque;
+ GPollFD pfd;
+
+ pfd.fd = g_io_channel_unix_get_fd(s->fd);
+ pfd.events = G_IO_OUT;
+ pfd.revents = 0;
+ g_poll(&pfd, 1, 0);
+ if (pfd.revents & G_IO_HUP) {
+ pty_chr_state(chr, 0);
+ } else {
+ pty_chr_state(chr, 1);
+ }
+}
+
static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
{
PtyCharDriver *s = chr->opaque;
@@ -1107,22 +1123,6 @@ static gboolean pty_chr_read(GIOChannel *chan,
GIOCondition cond, void *opaque)
return TRUE;
}
-static void pty_chr_update_read_handler(CharDriverState *chr)
-{
- PtyCharDriver *s = chr->opaque;
- GPollFD pfd;
-
- pfd.fd = g_io_channel_unix_get_fd(s->fd);
- pfd.events = G_IO_OUT;
- pfd.revents = 0;
- g_poll(&pfd, 1, 0);
- if (pfd.revents & G_IO_HUP) {
- pty_chr_state(chr, 0);
- } else {
- pty_chr_state(chr, 1);
- }
-}
-
static void pty_chr_state(CharDriverState *chr, int connected)
{
PtyCharDriver *s = chr->opaque;
--
1.9.3
- [Qemu-devel] [PULL 25/40] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, (continued)
- [Qemu-devel] [PULL 25/40] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 26/40] qapi event: convert BLOCK_IMAGE_CORRUPTED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 27/40] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 30/40] qapi event: convert SPICE events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 34/40] qapi event: clean up, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 28/40] qapi event: convert NIC_RX_FILTER_CHANGED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 35/40] qemu-char: introduce qemu_chr_alloc, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 29/40] qapi event: convert VNC events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 32/40] qapi event: convert GUEST_PANICKED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 31/40] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 37/40] qemu-char: move pty_chr_update_read_handler around,
Luiz Capitulino <=
- [Qemu-devel] [PULL 33/40] qapi event: convert QUORUM events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 38/40] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 36/40] qemu-char: do not call chr_write directly, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 40/40] monitor: protect event emission, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 39/40] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 12/40] qapi: add new schema file qapi-event.json, Luiz Capitulino, 2014/06/19
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Peter Maydell, 2014/06/20