From: Lei Li <lilei@linux.vnet.ibm.com>
Date: Thu, 19 Jul 2012 14:09:22 +0000 (+0800)
Subject: qemu-char: (Re-)connect for tcp_chr_write() unconnected writing
X-Git-Tag: v1.2.0-rc0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3767ed0eb;p=thirdparty%2Fqemu.git

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>
---

diff --git a/qemu-char.c b/qemu-char.c
index 10d15049480..398baf1e04f 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;
     }
 }