david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-char: convert pty to GIOChannel

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Message-id: 339eebf3c59a450b0354056e9ac4b41f67230831.1362505276.git.amit.shah@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-03-05 23:21:20 +05:30
parent a29753f8aa
commit 093d3a2005
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
qemu-char.c
View File

@ -953,7 +953,8 @@ static void cfmakeraw (struct termios *termios_p)
#define HAVE_CHARDEV_TTY 1 #define HAVE_CHARDEV_TTY 1
typedef struct { typedef struct {
int fd; GIOChannel *fd;
guint fd_tag;
int connected; int connected;
int polling; int polling;
int read_bytes; int read_bytes;
@ -972,7 +973,7 @@ static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
pty_chr_update_read_handler(chr); pty_chr_update_read_handler(chr);
return 0; return 0;
} }
return send_all(s->fd, buf, len); return io_channel_send_all(s->fd, buf, len);
} }
static int pty_chr_read_poll(void *opaque) static int pty_chr_read_poll(void *opaque)
@ -984,36 +985,39 @@ static int pty_chr_read_poll(void *opaque)
return s->read_bytes; return s->read_bytes;
} }
static void pty_chr_read(void *opaque) static gboolean pty_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
{ {
CharDriverState *chr = opaque; CharDriverState *chr = opaque;
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
int size, len; gsize size, len;
uint8_t buf[READ_BUF_LEN]; uint8_t buf[READ_BUF_LEN];
GIOStatus status;
len = sizeof(buf); len = sizeof(buf);
if (len > s->read_bytes) if (len > s->read_bytes)
len = s->read_bytes; len = s->read_bytes;
if (len == 0) if (len == 0)
return; return FALSE;
size = read(s->fd, buf, len); status = g_io_channel_read_chars(s->fd, (gchar *)buf, len, &size, NULL);
if ((size == -1 && errno == EIO) || if (status != G_IO_STATUS_NORMAL) {
(size == 0)) {
pty_chr_state(chr, 0); pty_chr_state(chr, 0);
return; return FALSE;
} } else {
if (size > 0) {
pty_chr_state(chr, 1); pty_chr_state(chr, 1);
qemu_chr_be_write(chr, buf, size); qemu_chr_be_write(chr, buf, size);
} }
return TRUE;
} }
static void pty_chr_update_read_handler(CharDriverState *chr) static void pty_chr_update_read_handler(CharDriverState *chr)
{ {
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
qemu_set_fd_handler2(s->fd, pty_chr_read_poll, if (s->fd_tag) {
pty_chr_read, NULL, chr); g_source_remove(s->fd_tag);
}
s->fd_tag = io_add_watch_poll(s->fd, pty_chr_read_poll, pty_chr_read, chr);
s->polling = 1; s->polling = 1;
/* /*
* Short timeout here: just need wait long enougth that qemu makes * Short timeout here: just need wait long enougth that qemu makes
@ -1031,7 +1035,8 @@ static void pty_chr_state(CharDriverState *chr, int connected)
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
if (!connected) { if (!connected) {
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); g_source_remove(s->fd_tag);
s->fd_tag = 0;
s->connected = 0; s->connected = 0;
s->polling = 0; s->polling = 0;
/* (re-)connect poll interval for idle guests: once per second. /* (re-)connect poll interval for idle guests: once per second.
@ -1066,9 +1071,14 @@ static void pty_chr_timer(void *opaque)
static void pty_chr_close(struct CharDriverState *chr) static void pty_chr_close(struct CharDriverState *chr)
{ {
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
int fd;
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); if (s->fd_tag) {
close(s->fd); g_source_remove(s->fd_tag);
}
fd = g_io_channel_unix_get_fd(s->fd);
g_io_channel_unref(s->fd);
close(fd);
qemu_del_timer(s->timer); qemu_del_timer(s->timer);
qemu_free_timer(s->timer); qemu_free_timer(s->timer);
g_free(s); g_free(s);
@ -1120,7 +1130,7 @@ static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
chr->chr_update_read_handler = pty_chr_update_read_handler; chr->chr_update_read_handler = pty_chr_update_read_handler;
chr->chr_close = pty_chr_close; chr->chr_close = pty_chr_close;
s->fd = master_fd; s->fd = io_channel_from_fd(master_fd);
s->timer = qemu_new_timer_ms(rt_clock, pty_chr_timer, chr); s->timer = qemu_new_timer_ms(rt_clock, pty_chr_timer, chr);
return chr; return chr;