From patchwork Mon Jan 27 10:30:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stratos Psomadakis X-Patchwork-Id: 314349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AE20A2C0099 for ; Mon, 27 Jan 2014 21:31:14 +1100 (EST) Received: from localhost ([::1]:58752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7jTD-0002Oh-Oq for incoming@patchwork.ozlabs.org; Mon, 27 Jan 2014 05:31:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7jSt-00022K-7Q for qemu-devel@nongnu.org; Mon, 27 Jan 2014 05:30:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7jSm-00078v-Um for qemu-devel@nongnu.org; Mon, 27 Jan 2014 05:30:51 -0500 Received: from averel.grnet-hq.admin.grnet.gr ([195.251.29.3]:42536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7jSm-0006mS-NW for qemu-devel@nongnu.org; Mon, 27 Jan 2014 05:30:44 -0500 Received: from smtps.admin.grnet.gr ([195.251.28.70]) by averel.grnet-hq.admin.grnet.gr over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 27 Jan 2014 12:30:17 +0200 Received: from localhost.localdomain (gate.okeanos.io [62.217.123.196]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: psomas@admin.grnet.gr) by smtps.admin.grnet.gr (Postfix) with ESMTPSA id 5E5CF180DD; Mon, 27 Jan 2014 12:30:17 +0200 (EET) From: Stratos Psomadakis To: qemu-devel@nongnu.org Date: Mon, 27 Jan 2014 12:30:15 +0200 Message-Id: <1390818615-4926-1-git-send-email-psomas@grnet.gr> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20140124184822.4a49e3ea@redhat.com> References: <20140124184822.4a49e3ea@redhat.com> X-OriginalArrivalTime: 27 Jan 2014 10:30:17.0670 (UTC) FILETIME=[C5C6BE60:01CF1B4A] X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] X-Received-From: 195.251.29.3 Cc: synnefo-devel@googlegroups.com, Stratos Psomdakis , ganeti-devel@googlegroups.com, dimara@grnet.gr Subject: [Qemu-devel] [PATCH] monitor: Cleanup mon->outbuf on write error 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 In case monitor_flush() fails to write the contents of mon->outbuf to the output device, mon->outbuf is not cleaned up properly. Check the return code of the qemu_chr_fe_write() function and cleanup the outbuf if it fails. References: http://lists.nongnu.org/archive/html/qemu-devel/2014-01/msg02890.html Signed-off-by: Stratos Psomadakis Signed-off-by: Dimitris Aragiorgis --- monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 80456fb..cba56bc 100644 --- a/monitor.c +++ b/monitor.c @@ -288,8 +288,8 @@ void monitor_flush(Monitor *mon) if (len && !mon->mux_out) { rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len); - if (rc == len) { - /* all flushed */ + if ((rc < 0 && errno != EAGAIN) || (rc == len)) { + /* all flushed or error */ QDECREF(mon->outbuf); mon->outbuf = qstring_new(); return;