[Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

The second patch is too large as a mail, you can pull from:

    https://github.com/famz/qemu.git 035-filter-qemu-io

v2: Rebase to current master.
    [01] Add Reviewed-by for Eric.
    [02] Update comment to describe the command for mechanical substitution. (Eric)

Fam Zheng (2):
  qemu-iotests: Filter qemu-io output in 025
  qemu-iotests: Filter out 'qemu-io> ' prompt

 tests/qemu-iotests/013.out       | 44080 ++++++++++++-------------
 tests/qemu-iotests/014.out       | 64204 ++++++++++++++++++-------------------
 tests/qemu-iotests/017.out       |  1080 +-
 tests/qemu-iotests/018.out       |  1080 +-
 tests/qemu-iotests/019.out       |  1636 +-
 tests/qemu-iotests/020.out       |  1080 +-
 tests/qemu-iotests/022.out       |  8816 ++---
 tests/qemu-iotests/023.out       | 26800 ++++++++--------
 tests/qemu-iotests/024.out       |   164 +-
 tests/qemu-iotests/025           |     2 +-
 tests/qemu-iotests/025.out       |    18 +-
 tests/qemu-iotests/028.out       |   458 +-
 tests/qemu-iotests/032.out       |    68 +-
 tests/qemu-iotests/035.out       |     2 +-
 tests/qemu-iotests/037.out       |   616 +-
 tests/qemu-iotests/038.out       |   714 +-
 tests/qemu-iotests/046.out       |   232 +-
 tests/qemu-iotests/047.out       |    20 +-
 tests/qemu-iotests/048.out       |    34 +-
 tests/qemu-iotests/common.filter |     3 +-
 20 files changed, 75554 insertions(+), 75553 deletions(-)

-- 
1.8.4.2

[Qemu-devel] [PATCH v2 1/2] qemu-iotests: Filter qemu-io output in 025

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/025 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index a7241cc..9426c93 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -56,7 +56,7 @@ _check_test_img
 
 echo
 echo "=== Resizing image"
-$QEMU_IO "$TEST_IMG" <<EOF
+$QEMU_IO "$TEST_IMG" <<EOF | _filter_qemu_io
 length
 truncate $big_size
 length
-- 
1.8.4.2

[Qemu-devel] [PATCH v2 2/2] qemu-iotests: Filter out 'qemu-io> ' prompt

[Fam Zheng]

This removes "qemu-io> " prompt from qemu-io output in _filter_qemu_io,
and updates all the output files with the following command:

 cd tests/qemu-iotests && sed -i "s/qemu-io> //g" *.out

Signed-off-by: Fam Zheng <famz@redhat.com>
---

This patch is snipped because the size would be rejected by list. See cover letter for the address to pull.

---
 tests/qemu-iotests/013.out       | 44080 ++++++++++++-------------
 tests/qemu-iotests/014.out       | 64204 ++++++++++++++++++-------------------
 tests/qemu-iotests/017.out       |  1080 +-
 tests/qemu-iotests/018.out       |  1080 +-
 tests/qemu-iotests/019.out       |  1636 +-
 tests/qemu-iotests/020.out       |  1080 +-
 tests/qemu-iotests/022.out       |  8816 ++---
 tests/qemu-iotests/023.out       | 26800 ++++++++--------
 tests/qemu-iotests/024.out       |   164 +-
 tests/qemu-iotests/025.out       |    18 +-
 tests/qemu-iotests/028.out       |   458 +-
 tests/qemu-iotests/032.out       |    68 +-
 tests/qemu-iotests/035.out       |     2 +-
 tests/qemu-iotests/037.out       |   616 +-
 tests/qemu-iotests/038.out       |   714 +-
 tests/qemu-iotests/046.out       |   232 +-
 tests/qemu-iotests/047.out       |    20 +-
 tests/qemu-iotests/048.out       |    34 +-
 tests/qemu-iotests/common.filter |     3 +-
 19 files changed, 75553 insertions(+), 75552 deletions(-)

[snip]

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 8e7b1a4..9c82c77 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -149,7 +149,8 @@ _filter_win32()
 # sanitize qemu-io output
 _filter_qemu_io()
 {
-    _filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/"
+    _filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \
+        -e "s/qemu-io> //g"
 }
 
 # replace occurrences of QEMU_PROG with "qemu"
-- 
1.8.4.2

Re: [Qemu-devel] [PATCH v2 2/2] qemu-iotests: Filter out 'qemu-io> ' prompt

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

On 11/19/2013 07:25 PM, Fam Zheng wrote:
> This removes "qemu-io> " prompt from qemu-io output in _filter_qemu_io,
> and updates all the output files with the following command:
> 
>  cd tests/qemu-iotests && sed -i "s/qemu-io> //g" *.out
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> 
> This patch is snipped because the size would be rejected by list. See cover letter for the address to pull.

Thanks for the updated commit message; and I did indeed verify that the
sed you listed gives the same results in my tree as the one I fetched
from your cover letter.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

On 2013年11月20日 10:25, Fam Zheng wrote:
> The second patch is too large as a mail, you can pull from:
>
>      https://github.com/famz/qemu.git 035-filter-qemu-io
>
> v2: Rebase to current master.
>      [01] Add Reviewed-by for Eric.
>      [02] Update comment to describe the command for mechanical substitution. (Eric)
>
> Fam Zheng (2):
>    qemu-iotests: Filter qemu-io output in 025
>    qemu-iotests: Filter out 'qemu-io> ' prompt
>
>   tests/qemu-iotests/013.out       | 44080 ++++++++++++-------------
>   tests/qemu-iotests/014.out       | 64204 ++++++++++++++++++-------------------
>   tests/qemu-iotests/017.out       |  1080 +-
>   tests/qemu-iotests/018.out       |  1080 +-
>   tests/qemu-iotests/019.out       |  1636 +-
>   tests/qemu-iotests/020.out       |  1080 +-
>   tests/qemu-iotests/022.out       |  8816 ++---
>   tests/qemu-iotests/023.out       | 26800 ++++++++--------
>   tests/qemu-iotests/024.out       |   164 +-
>   tests/qemu-iotests/025           |     2 +-
>   tests/qemu-iotests/025.out       |    18 +-
>   tests/qemu-iotests/028.out       |   458 +-
>   tests/qemu-iotests/032.out       |    68 +-
>   tests/qemu-iotests/035.out       |     2 +-
>   tests/qemu-iotests/037.out       |   616 +-
>   tests/qemu-iotests/038.out       |   714 +-
>   tests/qemu-iotests/046.out       |   232 +-
>   tests/qemu-iotests/047.out       |    20 +-
>   tests/qemu-iotests/048.out       |    34 +-
>   tests/qemu-iotests/common.filter |     3 +-
>   20 files changed, 75554 insertions(+), 75553 deletions(-)
>

Kevin, would you like to take this one?

Fam

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Kevin Wolf]

Am 27.11.2013 um 03:01 hat Fam Zheng geschrieben:
> On 2013年11月20日 10:25, Fam Zheng wrote:
> >The second patch is too large as a mail, you can pull from:
> >
> >     https://github.com/famz/qemu.git 035-filter-qemu-io
> >
> >v2: Rebase to current master.
> >     [01] Add Reviewed-by for Eric.
> >     [02] Update comment to describe the command for mechanical substitution. (Eric)
> 
> Kevin, would you like to take this one?

I would, but this way it simply doesn't work.

The '035-filter-qemu-io' branch in your repo is something, but certainly
not this series. It may be some early RFC where you only fixed one case.
I then found the 'iotests-filter-qemu-io' (which is already not what you
said) branch and I almost would have applied it, but I noticed it's not
exactly the same as this series; I suppose it's version 1.

Eric reviewed _something_, but the two branches I found aren't what you
sent, and he didn't specify the commit ID he reviewed, so I can't put
his Reviewed-by tag anywhere, because I simply don't know what he looked
at.

Fam, can you push the _current_ version somewhere and tell me the
correct branch name and commit ID? Eric, can you then tell me if this
newly pushed code matches what you reviewed?

Kevin

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

On Thu, Nov 28, 2013 at 7:56 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> Am 27.11.2013 um 03:01 hat Fam Zheng geschrieben:
>> On 2013年11月20日 10:25, Fam Zheng wrote:
>> >The second patch is too large as a mail, you can pull from:
>> >
>> >     https://github.com/famz/qemu.git 035-filter-qemu-io
>> >
>> >v2: Rebase to current master.
>> >     [01] Add Reviewed-by for Eric.
>> >     [02] Update comment to describe the command for mechanical substitution. (Eric)
>>
>> Kevin, would you like to take this one?
>
> I would, but this way it simply doesn't work.
>
> The '035-filter-qemu-io' branch in your repo is something, but certainly
> not this series. It may be some early RFC where you only fixed one case.
> I then found the 'iotests-filter-qemu-io' (which is already not what you
> said) branch and I almost would have applied it, but I noticed it's not
> exactly the same as this series; I suppose it's version 1.
>
> Eric reviewed _something_, but the two branches I found aren't what you
> sent, and he didn't specify the commit ID he reviewed, so I can't put
> his Reviewed-by tag anywhere, because I simply don't know what he looked
> at.
>
> Fam, can you push the _current_ version somewhere and tell me the
> correct branch name and commit ID? Eric, can you then tell me if this
> newly pushed code matches what you reviewed?

Sorry, I've pushed again to:

    https://github.com/famz/qemu.git for-kevin

Please fetch again.

Fam

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Kevin Wolf]

Am 28.11.2013 um 15:34 hat Fam Zheng geschrieben:
> On Thu, Nov 28, 2013 at 7:56 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> > Am 27.11.2013 um 03:01 hat Fam Zheng geschrieben:
> >> On 2013年11月20日 10:25, Fam Zheng wrote:
> >> >The second patch is too large as a mail, you can pull from:
> >> >
> >> >     https://github.com/famz/qemu.git 035-filter-qemu-io
> >> >
> >> >v2: Rebase to current master.
> >> >     [01] Add Reviewed-by for Eric.
> >> >     [02] Update comment to describe the command for mechanical substitution. (Eric)
> >>
> >> Kevin, would you like to take this one?
> >
> > I would, but this way it simply doesn't work.
> >
> > The '035-filter-qemu-io' branch in your repo is something, but certainly
> > not this series. It may be some early RFC where you only fixed one case.
> > I then found the 'iotests-filter-qemu-io' (which is already not what you
> > said) branch and I almost would have applied it, but I noticed it's not
> > exactly the same as this series; I suppose it's version 1.
> >
> > Eric reviewed _something_, but the two branches I found aren't what you
> > sent, and he didn't specify the commit ID he reviewed, so I can't put
> > his Reviewed-by tag anywhere, because I simply don't know what he looked
> > at.
> >
> > Fam, can you push the _current_ version somewhere and tell me the
> > correct branch name and commit ID? Eric, can you then tell me if this
> > newly pushed code matches what you reviewed?
> 
> Sorry, I've pushed again to:
> 
>     https://github.com/famz/qemu.git for-kevin
> 
> Please fetch again.

Thanks, cherry-picked the patches from that branch (commit ID of the
top is 0974950e05137c7751ec1d3c5d1b0fa5387eead9). I didn't add Eric's
Reviewed-by yet, but I'll do so when he confirms that this is what he
checked.

Kevin

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 2241 bytes --]

On 11/28/2013 07:49 AM, Kevin Wolf wrote:

>>>>>     https://github.com/famz/qemu.git 035-filter-qemu-io
>>>>>
>>>>> v2: Rebase to current master.
>>>>>     [01] Add Reviewed-by for Eric.
>>>>>     [02] Update comment to describe the command for mechanical substitution. (Eric)
>>>>
>>>> Kevin, would you like to take this one?
>>>
>>> I would, but this way it simply doesn't work.
>>>
>>> The '035-filter-qemu-io' branch in your repo is something, but certainly
>>> not this series. It may be some early RFC where you only fixed one case.
>>> I then found the 'iotests-filter-qemu-io' (which is already not what you
>>> said) branch and I almost would have applied it, but I noticed it's not
>>> exactly the same as this series; I suppose it's version 1.
>>>
>>> Eric reviewed _something_, but the two branches I found aren't what you
>>> sent, and he didn't specify the commit ID he reviewed, so I can't put
>>> his Reviewed-by tag anywhere, because I simply don't know what he looked
>>> at.

And I've since lost track of which commit id I reviewed.

>>>
>>> Fam, can you push the _current_ version somewhere and tell me the
>>> correct branch name and commit ID? Eric, can you then tell me if this
>>> newly pushed code matches what you reviewed?
>>
>> Sorry, I've pushed again to:
>>
>>     https://github.com/famz/qemu.git for-kevin
>>
>> Please fetch again.
> 
> Thanks, cherry-picked the patches from that branch (commit ID of the
> top is 0974950e05137c7751ec1d3c5d1b0fa5387eead9). I didn't add Eric's
> Reviewed-by yet, but I'll do so when he confirms that this is what he
> checked.

I have now reviewed commit 0974950e05137c7751ec1d3c5d1b0fa5387eead9 in
the same manner as before (manually followed the 'sed' instructions in
the commit message and verified that the only differences remaining are
the added filter).  It appears that the only differences in this known
commit id from whatever (now unknown) commit I first reviewed is thus
limited to rebase differences.  I'm happy with the commit, so feel free
to (re-)add:

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

于2013年11月29日 星期五 01时57分42秒,Eric Blake写到:
> On 11/28/2013 07:49 AM, Kevin Wolf wrote:
>
>>>>>>      https://github.com/famz/qemu.git 035-filter-qemu-io
>>>>>>
>>>>>> v2: Rebase to current master.
>>>>>>      [01] Add Reviewed-by for Eric.
>>>>>>      [02] Update comment to describe the command for mechanical substitution. (Eric)
>>>>>
>>>>> Kevin, would you like to take this one?
>>>>
>>>> I would, but this way it simply doesn't work.
>>>>
>>>> The '035-filter-qemu-io' branch in your repo is something, but certainly
>>>> not this series. It may be some early RFC where you only fixed one case.
>>>> I then found the 'iotests-filter-qemu-io' (which is already not what you
>>>> said) branch and I almost would have applied it, but I noticed it's not
>>>> exactly the same as this series; I suppose it's version 1.
>>>>
>>>> Eric reviewed _something_, but the two branches I found aren't what you
>>>> sent, and he didn't specify the commit ID he reviewed, so I can't put
>>>> his Reviewed-by tag anywhere, because I simply don't know what he looked
>>>> at.
>
> And I've since lost track of which commit id I reviewed.
>
>>>>
>>>> Fam, can you push the _current_ version somewhere and tell me the
>>>> correct branch name and commit ID? Eric, can you then tell me if this
>>>> newly pushed code matches what you reviewed?
>>>
>>> Sorry, I've pushed again to:
>>>
>>>      https://github.com/famz/qemu.git for-kevin
>>>
>>> Please fetch again.
>>
>> Thanks, cherry-picked the patches from that branch (commit ID of the
>> top is 0974950e05137c7751ec1d3c5d1b0fa5387eead9). I didn't add Eric's
>> Reviewed-by yet, but I'll do so when he confirms that this is what he
>> checked.
>
> I have now reviewed commit 0974950e05137c7751ec1d3c5d1b0fa5387eead9 in
> the same manner as before (manually followed the 'sed' instructions in
> the commit message and verified that the only differences remaining are
> the added filter).  It appears that the only differences in this known
> commit id from whatever (now unknown) commit I first reviewed is thus
> limited to rebase differences.  I'm happy with the commit, so feel free
> to (re-)add:
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
>

Thanks Eric. I'm sorry for the trouble.

Fam

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Kevin Wolf]

[-- Attachment #1: Type: text/plain, Size: 2332 bytes --]

Am 28.11.2013 um 18:57 hat Eric Blake geschrieben:
> On 11/28/2013 07:49 AM, Kevin Wolf wrote:
> 
> >>>>>     https://github.com/famz/qemu.git 035-filter-qemu-io
> >>>>>
> >>>>> v2: Rebase to current master.
> >>>>>     [01] Add Reviewed-by for Eric.
> >>>>>     [02] Update comment to describe the command for mechanical substitution. (Eric)
> >>>>
> >>>> Kevin, would you like to take this one?
> >>>
> >>> I would, but this way it simply doesn't work.
> >>>
> >>> The '035-filter-qemu-io' branch in your repo is something, but certainly
> >>> not this series. It may be some early RFC where you only fixed one case.
> >>> I then found the 'iotests-filter-qemu-io' (which is already not what you
> >>> said) branch and I almost would have applied it, but I noticed it's not
> >>> exactly the same as this series; I suppose it's version 1.
> >>>
> >>> Eric reviewed _something_, but the two branches I found aren't what you
> >>> sent, and he didn't specify the commit ID he reviewed, so I can't put
> >>> his Reviewed-by tag anywhere, because I simply don't know what he looked
> >>> at.
> 
> And I've since lost track of which commit id I reviewed.
> 
> >>>
> >>> Fam, can you push the _current_ version somewhere and tell me the
> >>> correct branch name and commit ID? Eric, can you then tell me if this
> >>> newly pushed code matches what you reviewed?
> >>
> >> Sorry, I've pushed again to:
> >>
> >>     https://github.com/famz/qemu.git for-kevin
> >>
> >> Please fetch again.
> > 
> > Thanks, cherry-picked the patches from that branch (commit ID of the
> > top is 0974950e05137c7751ec1d3c5d1b0fa5387eead9). I didn't add Eric's
> > Reviewed-by yet, but I'll do so when he confirms that this is what he
> > checked.
> 
> I have now reviewed commit 0974950e05137c7751ec1d3c5d1b0fa5387eead9 in
> the same manner as before (manually followed the 'sed' instructions in
> the commit message and verified that the only differences remaining are
> the added filter).  It appears that the only differences in this known
> commit id from whatever (now unknown) commit I first reviewed is thus
> limited to rebase differences.  I'm happy with the commit, so feel free
> to (re-)add:
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks, Eric, I've added it back now.

Kevin

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [Qemu-devel] [PATCH v2 0/2] qemu-iotests: Filter out "qemu-io> " in all tests

[Fam Zheng]

On Thu, Nov 28, 2013 at 7:56 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> Am 27.11.2013 um 03:01 hat Fam Zheng geschrieben:
>> On 2013年11月20日 10:25, Fam Zheng wrote:
>> >The second patch is too large as a mail, you can pull from:
>> >
>> >     https://github.com/famz/qemu.git 035-filter-qemu-io
>> >
>> >v2: Rebase to current master.
>> >     [01] Add Reviewed-by for Eric.
>> >     [02] Update comment to describe the command for mechanical substitution. (Eric)
>>
>> Kevin, would you like to take this one?
>
> I would, but this way it simply doesn't work.
>
> The '035-filter-qemu-io' branch in your repo is something, but certainly
> not this series. It may be some early RFC where you only fixed one case.
> I then found the 'iotests-filter-qemu-io' (which is already not what you
> said) branch and I almost would have applied it, but I noticed it's not
> exactly the same as this series; I suppose it's version 1.
>
> Eric reviewed _something_, but the two branches I found aren't what you
> sent, and he didn't specify the commit ID he reviewed, so I can't put
> his Reviewed-by tag anywhere, because I simply don't know what he looked
> at.
>
> Fam, can you push the _current_ version somewhere and tell me the
> correct branch name and commit ID? Eric, can you then tell me if this
> newly pushed code matches what you reviewed?

Sorry, I've pushed again to:

    https://github.com/famz/qemu.git for-kevin

Please fetch again, with commit ID
f35df947046e54a7795d49fb87671f495cf8387a..f35df947046e54a7795d49fb87671f495cf8387a

Fam