Commit c3767ed0 authored Jul 19, 2012 by Lei Li Committed by Anthony Liguori Aug 16, 2012

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>

parent be522029

qemu-char.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}