From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VobMr-0003Ao-00 for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:01:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VobMl-0002F3-N1 for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:01:32 -0500 Received: from mail-ee0-x22d.google.com ([2a00:1450:4013:c00::22d]:65312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VobMl-0002Ec-Gv for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:01:27 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so3408092eek.4 for ; Thu, 05 Dec 2013 08:01:26 -0800 (PST) Date: Thu, 5 Dec 2013 17:01:23 +0100 From: Stefan Hajnoczi Message-ID: <20131205160123.GA16502@stefanha-thinkpad.redhat.com> References: <1384439646-19703-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1384439646-19703-1-git-send-email-stefanha@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu-iotests: filter QEMU monitor \r\n List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , qemu-devel@nongnu.org, Luiz Capitulino On Thu, Nov 14, 2013 at 03:34:06PM +0100, Stefan Hajnoczi wrote: > SMTP does not preserve newlines. This is normally not a problem if the > email body uses DOS or UNIX newlines consistently. In 051.out we mix > UNIX newlines with DOS newlines (since QEMU monitor output uses \r\n). > > This patch filters the QEMU monitor output so the golden master file > uses UNIX newlines exclusively. > > The result is that patches touching 051.out will apply cleanly without > mangling newlines after this commit. > > Signed-off-by: Stefan Hajnoczi > --- > If you have trouble applying this patch, you can use by git repo: > git://github.com/stefanha/qemu.git fix-qemu-io-cr > > Luiz: CCed you just because I was surprised monitor.c uses \r\n. Perhaps this > is because terminal or telnet emulation is somehow mixed into the core > monitor.c code? > > tests/qemu-iotests/051.out | 112 +++++++++++++++++++-------------------- > tests/qemu-iotests/common.filter | 3 +- > 2 files changed, 58 insertions(+), 57 deletions(-) Applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan