| Message ID | 4044e6699f48e9248cabe4fca4137d077cb37868.1409216371.git.hutao@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 28, 2014 at 04:56:03PM +0800, Hu Tao wrote: > We should filter out encryption=on, too. > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > --- > tests/qemu-iotests/common.filter | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter > index 51192c8..362394e 100644 > --- a/tests/qemu-iotests/common.filter > +++ b/tests/qemu-iotests/common.filter > @@ -176,7 +176,7 @@ _filter_img_create() > sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ > -e "s#$TEST_DIR#TEST_DIR#g" \ > -e "s#$IMGFMT#IMGFMT#g" \ > - -e "s# encryption=off##g" \ > + -e "s# encryption=\\(on\\|off\\)##g" \ Why? Stefan
On Fri, Aug 29, 2014 at 05:06:20PM +0100, Stefan Hajnoczi wrote: > On Thu, Aug 28, 2014 at 04:56:03PM +0800, Hu Tao wrote: > > We should filter out encryption=on, too. > > > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > > --- > > tests/qemu-iotests/common.filter | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter > > index 51192c8..362394e 100644 > > --- a/tests/qemu-iotests/common.filter > > +++ b/tests/qemu-iotests/common.filter > > @@ -176,7 +176,7 @@ _filter_img_create() > > sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ > > -e "s#$TEST_DIR#TEST_DIR#g" \ > > -e "s#$IMGFMT#IMGFMT#g" \ > > - -e "s# encryption=off##g" \ > > + -e "s# encryption=\\(on\\|off\\)##g" \ > > Why? This is considered a bug of _filter_img_create(). It should have filtered out driver specific option 'encryption=on', too. Regards, Hu
On Thu, Sep 04, 2014 at 05:03:01PM +0800, Hu Tao wrote: > On Fri, Aug 29, 2014 at 05:06:20PM +0100, Stefan Hajnoczi wrote: > > On Thu, Aug 28, 2014 at 04:56:03PM +0800, Hu Tao wrote: > > > We should filter out encryption=on, too. > > > > > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > > > --- > > > tests/qemu-iotests/common.filter | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter > > > index 51192c8..362394e 100644 > > > --- a/tests/qemu-iotests/common.filter > > > +++ b/tests/qemu-iotests/common.filter > > > @@ -176,7 +176,7 @@ _filter_img_create() > > > sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ > > > -e "s#$TEST_DIR#TEST_DIR#g" \ > > > -e "s#$IMGFMT#IMGFMT#g" \ > > > - -e "s# encryption=off##g" \ > > > + -e "s# encryption=\\(on\\|off\\)##g" \ > > > > Why? > > This is considered a bug of _filter_img_create(). It should have filtered out > driver specific option 'encryption=on', too. You have not posted justification for this patch series. As far as I know, there is no reason to filter these options. And your series breaks qemu-iotests because you didn't update the .out files. NACK Stefan
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 51192c8..362394e 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -176,7 +176,7 @@ _filter_img_create() sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ - -e "s# encryption=off##g" \ + -e "s# encryption=\\(on\\|off\\)##g" \ -e "s# cluster_size=[0-9]\\+##g" \ -e "s# table_size=[0-9]\\+##g" \ -e "s# compat='[^']*'##g" \
We should filter out encryption=on, too. Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- tests/qemu-iotests/common.filter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)