qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@gmail.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-devel@nongnu.org, Luiz Capitulino <lcapitulino@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] qemu-iotests: filter QEMU monitor \r\n
Date: Thu, 5 Dec 2013 17:01:23 +0100	[thread overview]
Message-ID: <20131205160123.GA16502@stefanha-thinkpad.redhat.com> (raw)
In-Reply-To: <1384439646-19703-1-git-send-email-stefanha@redhat.com>

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 <stefanha@redhat.com>
> ---
> 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

      parent reply	other threads:[~2013-12-05 16:01 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14 14:34 [Qemu-devel] [PATCH] qemu-iotests: filter QEMU monitor \r\n Stefan Hajnoczi
2013-11-14 14:58 ` Eric Blake
2013-11-15  8:35   ` Stefan Hajnoczi
2013-11-15  2:29 ` Luiz Capitulino
2013-12-05 16:01 ` Stefan Hajnoczi [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131205160123.GA16502@stefanha-thinkpad.redhat.com \
    --to=stefanha@gmail.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).