diff options
author | Lei Li <lilei@linux.vnet.ibm.com> | 2012-07-19 22:09:22 +0800 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-16 13:41:38 -0500 |
commit | c3767ed0eb5d0bb25fe409ae5dec06e3411ff1b6 (patch) | |
tree | 371ab82289bd02aa88d1a89ac47e6794fa24c48d | |
parent | be52202902d166e914d426c8e3d8976b25121b4d (diff) |
qemu-char: (Re-)connect for tcp_chr_write() unconnected writing
tcp_chr_write() did not deal with writing to an unconnected
connection and return the original length of the data, it's
not right and would cause false writing. So (re-)connect it
and return 0 for this situation.
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | qemu-char.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qemu-char.c b/qemu-char.c index 10d1504948..398baf1e04 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2141,14 +2141,17 @@ typedef struct { static void tcp_chr_accept(void *opaque); +static void tcp_chr_connect(void *opaque); + static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len) { TCPCharDriver *s = chr->opaque; if (s->connected) { return send_all(s->fd, buf, len); } else { - /* XXX: indicate an error ? */ - return len; + /* (Re-)connect for unconnected writing */ + tcp_chr_connect(chr); + return 0; } } |