Patchwork qemu-iotests: Filter out vmdk creation options

login
register
mail settings
Submitter Fam Zheng
Date May 3, 2013, 1:31 a.m.
Message ID <1367544700-3970-1-git-send-email-famz@redhat.com>
Download mbox | patch
Permalink /patch/241123/
State New
Headers show

Comments

Fam Zheng - May 3, 2013, 1:31 a.m.
Cover new image creation options for vmdk, so we can use '-o
zeroed_grain=XXX' and '-o subformat=XXX' to run the tests successfully.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/common.rc | 2 ++
 1 file changed, 2 insertions(+)
Kevin Wolf - May 3, 2013, 6:48 a.m.
Am 03.05.2013 um 03:31 hat Fam Zheng geschrieben:
> Cover new image creation options for vmdk, so we can use '-o
> zeroed_grain=XXX' and '-o subformat=XXX' to run the tests successfully.
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/common.rc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index a536bf7..442cf51 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -127,6 +127,8 @@ _make_test_img()
>              -e "s# compat='[^']*'##g" \
>              -e "s# compat6=\\(on\\|off\\)##g" \
>              -e "s# static=\\(on\\|off\\)##g" \
> +            -e "s# zeroed_grain=\\(on\\|off\\)##g" \
> +            -e "s# subformat='[^']*'##g" \
>              -e "s# lazy_refcounts=\\(on\\|off\\)##g"
>  
>      # Start an NBD server on the image file, which is what we'll be talking to

Maybe add adapter_type as well? It's a string option, so it's not
displayed if it's not set, but if we want to make it testable (with an
explicit ./check -o option or in a new test case that adds it), we need
to filter it out.

But the patch obviously helps even without adapter_type, so anyway:

Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Fam Zheng - May 3, 2013, 7:30 a.m.
On Fri, 05/03 08:48, Kevin Wolf wrote:
> Am 03.05.2013 um 03:31 hat Fam Zheng geschrieben:
> > Cover new image creation options for vmdk, so we can use '-o
> > zeroed_grain=XXX' and '-o subformat=XXX' to run the tests successfully.
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  tests/qemu-iotests/common.rc | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> > index a536bf7..442cf51 100644
> > --- a/tests/qemu-iotests/common.rc
> > +++ b/tests/qemu-iotests/common.rc
> > @@ -127,6 +127,8 @@ _make_test_img()
> >              -e "s# compat='[^']*'##g" \
> >              -e "s# compat6=\\(on\\|off\\)##g" \
> >              -e "s# static=\\(on\\|off\\)##g" \
> > +            -e "s# zeroed_grain=\\(on\\|off\\)##g" \
> > +            -e "s# subformat='[^']*'##g" \
> >              -e "s# lazy_refcounts=\\(on\\|off\\)##g"
> >  
> >      # Start an NBD server on the image file, which is what we'll be talking to
> 
> Maybe add adapter_type as well? It's a string option, so it's not
> displayed if it's not set, but if we want to make it testable (with an
> explicit ./check -o option or in a new test case that adds it), we need
> to filter it out.
> 
> But the patch obviously helps even without adapter_type, so anyway:
> 
> Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Sure, I'll send another patch for that option.

Thanks.
Stefan Hajnoczi - May 3, 2013, 9:14 a.m.
On Fri, May 03, 2013 at 09:31:40AM +0800, Fam Zheng wrote:
> Cover new image creation options for vmdk, so we can use '-o
> zeroed_grain=XXX' and '-o subformat=XXX' to run the tests successfully.
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/common.rc | 2 ++
>  1 file changed, 2 insertions(+)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Patch

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index a536bf7..442cf51 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -127,6 +127,8 @@  _make_test_img()
             -e "s# compat='[^']*'##g" \
             -e "s# compat6=\\(on\\|off\\)##g" \
             -e "s# static=\\(on\\|off\\)##g" \
+            -e "s# zeroed_grain=\\(on\\|off\\)##g" \
+            -e "s# subformat='[^']*'##g" \
             -e "s# lazy_refcounts=\\(on\\|off\\)##g"
 
     # Start an NBD server on the image file, which is what we'll be talking to