Skip to contentSkip to conversation

qemu-iotests: fix two driver-specific option filtering problems

PATCH NAK Hu Tao 2 participants 7 messages Aug 28, 2014 – Sep 8, 2014

lore
Share & tools
lore

Hu Tao

author
#0 lore raw

cover qemu-iotests: fix two driver-specific option filtering problems

See each patch for the details.

Hu Tao (2):
qemu-iotests: fix filter of encryption option
qemu-iotests: filter out driver-specific option preallocation

 tests/qemu-iotests/common.filter | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.0
author
#1 lore raw

PATCH 1/2 qemu-iotests: fix filter of encryption option

We should filter out encryption=on, too.

---
 tests/qemu-iotests/common.filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/common.filter +1 -1
index 51192c8..362394e 100644
@@ -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" \
Signature · 1 line
1.8.0
#2 lore raw

Re: [Qemu-devel] [PATCH 1/2] qemu-iotests: fix filter of encryption option

Quoted 12 lines · Hu Tao

We should filter out encryption=on, too.

---
 tests/qemu-iotests/common.filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/common.filter +0 -0
index 51192c8..362394e 100644

tests/qemu-iotests/common.filter _filter_img_create() · line 179

Quoted 5 lines
tests/qemu-iotests/common.filter +1 -1
@@ -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

author
#3 lore raw

Re: [Qemu-devel] [PATCH 1/2] qemu-iotests: fix filter of encryption option

Quoted 8 lines · Stefan Hajnoczi
Quoted 7 lines · Hu Tao

We should filter out encryption=on, too.

---
 tests/qemu-iotests/common.filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

tests/qemu-iotests/common.filter _filter_img_create() · line 179

Quoted 10 lines
tests/qemu-iotests/common.filter +1 -1
index 51192c8..362394e 100644
@@ -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

#4 lore raw

Re: [Qemu-devel] [PATCH 1/2] qemu-iotests: fix filter of encryption option

Quoted 22 lines · Hu Tao
Quoted 8 lines · Stefan Hajnoczi
Quoted 7 lines · Hu Tao

We should filter out encryption=on, too.

---
 tests/qemu-iotests/common.filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

tests/qemu-iotests/common.filter _filter_img_create() · line 179

Quoted 10 lines
tests/qemu-iotests/common.filter +1 -1
index 51192c8..362394e 100644
@@ -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?

Quoted 2 lines

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

author
#5 lore raw

PATCH 2/2 qemu-iotests: filter out driver-specific option preallocation

In reply to Hu Tao
---
 tests/qemu-iotests/common.filter | 1 +
 1 file changed, 1 insertion(+)
tests/qemu-iotests/common.filter +1 -0
index 362394e..97d2934 100644
@@ -189,6 +189,7 @@ _filter_img_create()
         -e "s# block_size=[0-9]\\+##g" \
         -e "s# block_state_zero=\\(on\\|off\\)##g" \
         -e "s# log_size=[0-9]\\+##g" \
+        -e "s# preallocation='[^']*'##g" \
         -e "s/archipelago:a/TEST_DIR\//g"
 }
 
Signature · 1 line
1.8.0
#6 lore raw

Re: [Qemu-devel] [PATCH 2/2] qemu-iotests: filter out driver-specific option preallocation

Quoted 11 lines · Hu Tao
---
 tests/qemu-iotests/common.filter | 1 +
 1 file changed, 1 insertion(+)
tests/qemu-iotests/common.filter +0 -0
index 362394e..97d2934 100644

tests/qemu-iotests/common.filter _filter_img_create() · line 194

Quoted 6 lines
tests/qemu-iotests/common.filter +1 -0
@@ -189,6 +189,7 @@ _filter_img_create()
         -e "s# block_size=[0-9]\\+##g" \
         -e "s# block_state_zero=\\(on\\|off\\)##g" \
         -e "s# log_size=[0-9]\\+##g" \
+        -e "s# preallocation='[^']*'##g" \
         -e "s/archipelago:a/TEST_DIR\//g"
 }

This seems bogus.

Why does this patch filter the option without updating all the tests/qemu-iotests/*.out files that contain this output?

What is the point of this patch?

Stefan