From patchwork Wed Sep 12 21:55:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 183457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7DA1B2C00A0 for ; Thu, 13 Sep 2012 07:55:45 +1000 (EST) Received: from localhost ([::1]:39496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBuuN-0007xn-MG for incoming@patchwork.ozlabs.org; Wed, 12 Sep 2012 17:55:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBuuG-0007xi-RK for qemu-devel@nongnu.org; Wed, 12 Sep 2012 17:55:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBuuF-00088r-P4 for qemu-devel@nongnu.org; Wed, 12 Sep 2012 17:55:36 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:33090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBuuF-00088n-IP for qemu-devel@nongnu.org; Wed, 12 Sep 2012 17:55:35 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Sep 2012 15:55:34 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 12 Sep 2012 15:55:32 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 2AAC819D8048 for ; Wed, 12 Sep 2012 15:55:32 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8CLtVSv105860 for ; Wed, 12 Sep 2012 15:55:31 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8CLv0Fe008802 for ; Wed, 12 Sep 2012 15:57:00 -0600 Received: from titi.austin.rr.com (sig-9-65-86-195.mts.ibm.com [9.65.86.195]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8CLuxel008778; Wed, 12 Sep 2012 15:56:59 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 12 Sep 2012 16:55:29 -0500 Message-Id: <1347486929-22358-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.5.4 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12091221-7606-0000-0000-0000039B6F0C X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.154 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] Revert 455aa1e08 and c3767ed0eb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit c3767ed0eb5d0bb25fe409ae5dec06e3411ff1b6 qemu-char: (Re-)connect for tcp_chr_write() unconnected writing Has no hope of working because tcp_chr_connect() does not actually connect. 455aa1e08 just fixes the SEGV with server() but the attempt to connect a client socket is still completely broken. This patch reverts both. Reported-by: Richard W.M. Jones Signed-off-by: Anthony Liguori --- qemu-char.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 767da93..10d1504 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2141,18 +2141,13 @@ 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 if (s->listen_fd == -1) { - /* (Re-)connect for unconnected writing */ - tcp_chr_connect(chr); - return 0; } else { + /* XXX: indicate an error ? */ return len; } }