* [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia, Eric Blake, qemu-block, Kevin Wolf, Max Reitz Hi, this is the same patch I posted yesterday, but with a test case. Berto Alberto Garcia (2): commit: Make base read-only if there is an early failure iotests: Check that images are in read-only mode after block-commit block/commit.c | 3 ++ tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/249.out | 35 ++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 154 insertions(+) create mode 100755 tests/qemu-iotests/249 create mode 100644 tests/qemu-iotests/249.out -- 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, Alberto Garcia, qemu-block, Max Reitz Hi, this is the same patch I posted yesterday, but with a test case. Berto Alberto Garcia (2): commit: Make base read-only if there is an early failure iotests: Check that images are in read-only mode after block-commit block/commit.c | 3 ++ tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/249.out | 35 ++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 154 insertions(+) create mode 100755 tests/qemu-iotests/249 create mode 100644 tests/qemu-iotests/249.out -- 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH for-4.1 v2 1/2] commit: Make base read-only if there is an early failure @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia, Eric Blake, qemu-block, Kevin Wolf, Max Reitz You can reproduce this by passing an invalid filter-node-name (like "1234") to block-commit. In this case the base image is put in read-write mode but is never reset back to read-only. Signed-off-by: Alberto Garcia <berto@igalia.com> --- block/commit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/commit.c b/block/commit.c index ba60fef58a..698eda1dfe 100644 --- a/block/commit.c +++ b/block/commit.c @@ -384,6 +384,9 @@ fail: if (s->top) { blk_unref(s->top); } + if (s->base_read_only) { + bdrv_reopen_set_read_only(base, true, NULL); + } job_early_fail(&s->common.job); /* commit_top_bs has to be replaced after deleting the block job, * otherwise this would fail because of lack of permissions. */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH for-4.1 v2 1/2] commit: Make base read-only if there is an early failure @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, Alberto Garcia, qemu-block, Max Reitz You can reproduce this by passing an invalid filter-node-name (like "1234") to block-commit. In this case the base image is put in read-write mode but is never reset back to read-only. Signed-off-by: Alberto Garcia <berto@igalia.com> --- block/commit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/commit.c b/block/commit.c index ba60fef58a..698eda1dfe 100644 --- a/block/commit.c +++ b/block/commit.c @@ -384,6 +384,9 @@ fail: if (s->top) { blk_unref(s->top); } + if (s->base_read_only) { + bdrv_reopen_set_read_only(base, true, NULL); + } job_early_fail(&s->common.job); /* commit_top_bs has to be replaced after deleting the block job, * otherwise this would fail because of lack of permissions. */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 1/2] commit: Make base read-only if there is an early failure @ 2019-04-26 20:43 ` Max Reitz 0 siblings, 0 replies; 12+ messages in thread From: Max Reitz @ 2019-04-26 20:43 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Eric Blake, qemu-block, Kevin Wolf [-- Attachment #1: Type: text/plain, Size: 410 bytes --] On 11.04.19 14:32, Alberto Garcia wrote: > You can reproduce this by passing an invalid filter-node-name (like > "1234") to block-commit. In this case the base image is put in > read-write mode but is never reset back to read-only. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > --- > block/commit.c | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Max Reitz <mreitz@redhat.com> [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 1/2] commit: Make base read-only if there is an early failure @ 2019-04-26 20:43 ` Max Reitz 0 siblings, 0 replies; 12+ messages in thread From: Max Reitz @ 2019-04-26 20:43 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Kevin Wolf, qemu-block [-- Attachment #1: Type: text/plain, Size: 410 bytes --] On 11.04.19 14:32, Alberto Garcia wrote: > You can reproduce this by passing an invalid filter-node-name (like > "1234") to block-commit. In this case the base image is put in > read-write mode but is never reset back to read-only. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > --- > block/commit.c | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Max Reitz <mreitz@redhat.com> [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH for-4.1 v2 2/2] iotests: Check that images are in read-only mode after block-commit @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Alberto Garcia, Eric Blake, qemu-block, Kevin Wolf, Max Reitz This tests the fix from the previous patch. Signed-off-by: Alberto Garcia <berto@igalia.com> --- tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/249.out | 35 ++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 151 insertions(+) create mode 100755 tests/qemu-iotests/249 create mode 100644 tests/qemu-iotests/249.out diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 new file mode 100755 index 0000000000..a6ee2ef492 --- /dev/null +++ b/tests/qemu-iotests/249 @@ -0,0 +1,115 @@ +#!/usr/bin/env bash +# +# Test that a backing image is put back in read-only mode after +# block-commit (both when it fails and when it succeeds). +# +# Copyright (C) 2019 Igalia, S.L. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# creator +owner=berto@igalia.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm -f "$TEST_IMG.base" + rm -f "$TEST_IMG.int" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +# Any format implementing BlockDriver.bdrv_change_backing_file +_supported_fmt qcow2 qed +_supported_proto file +_supported_os Linux + +IMG_SIZE=1M + +# Create the images: base <- int <- active +TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt +TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt +_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt + +# Launch QEMU with these two drives: +# none0: base (read-only) +# none1: base <- int <- active +_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \ + -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +echo +echo '=== Send a write command to a drive opened in read-only mode (1)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +echo +echo '=== Run block-commit on base using an invalid filter node name' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int', + 'filter-node-name': '1234'}}" \ + 'error' + +echo +echo '=== Send a write command to a drive opened in read-only mode (2)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +echo +echo '=== Run block-commit on base using the default filter node name' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \ + 'return' + +# Wait for block-commit to finish +sleep 0.5 + +echo +echo '=== Send a write command to a drive opened in read-only mode (3)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +_cleanup_qemu + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out new file mode 100644 index 0000000000..dfb960c1af --- /dev/null +++ b/tests/qemu-iotests/249.out @@ -0,0 +1,35 @@ +QA output created by 249 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576 +Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int +{"return": {}} + +=== Send a write command to a drive opened in read-only mode (1) + +{"return": "Block node is read-onlyrn"} + +=== Run block-commit on base using an invalid filter node name + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} +{"error": {"class": "GenericError", "desc": "Invalid node name"}} + +=== Send a write command to a drive opened in read-only mode (2) + +{"return": "Block node is read-onlyrn"} + +=== Run block-commit on base using the default filter node name + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}} +{"return": {}} + +=== Send a write command to a drive opened in read-only mode (3) + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} +{"return": "Block node is read-onlyrn"} +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index bae7718380..7ac9a5ea4a 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -248,3 +248,4 @@ 246 rw auto quick 247 rw auto quick 248 rw auto quick +249 rw auto quick -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH for-4.1 v2 2/2] iotests: Check that images are in read-only mode after block-commit @ 2019-04-11 12:32 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-11 12:32 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, Alberto Garcia, qemu-block, Max Reitz This tests the fix from the previous patch. Signed-off-by: Alberto Garcia <berto@igalia.com> --- tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/249.out | 35 ++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 151 insertions(+) create mode 100755 tests/qemu-iotests/249 create mode 100644 tests/qemu-iotests/249.out diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 new file mode 100755 index 0000000000..a6ee2ef492 --- /dev/null +++ b/tests/qemu-iotests/249 @@ -0,0 +1,115 @@ +#!/usr/bin/env bash +# +# Test that a backing image is put back in read-only mode after +# block-commit (both when it fails and when it succeeds). +# +# Copyright (C) 2019 Igalia, S.L. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# creator +owner=berto@igalia.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + rm -f "$TEST_IMG.base" + rm -f "$TEST_IMG.int" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +# Any format implementing BlockDriver.bdrv_change_backing_file +_supported_fmt qcow2 qed +_supported_proto file +_supported_os Linux + +IMG_SIZE=1M + +# Create the images: base <- int <- active +TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt +TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt +_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt + +# Launch QEMU with these two drives: +# none0: base (read-only) +# none1: base <- int <- active +_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \ + -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +echo +echo '=== Send a write command to a drive opened in read-only mode (1)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +echo +echo '=== Run block-commit on base using an invalid filter node name' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int', + 'filter-node-name': '1234'}}" \ + 'error' + +echo +echo '=== Send a write command to a drive opened in read-only mode (2)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +echo +echo '=== Run block-commit on base using the default filter node name' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \ + 'return' + +# Wait for block-commit to finish +sleep 0.5 + +echo +echo '=== Send a write command to a drive opened in read-only mode (3)' +echo +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'human-monitor-command', + 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \ + 'return' + +_cleanup_qemu + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out new file mode 100644 index 0000000000..dfb960c1af --- /dev/null +++ b/tests/qemu-iotests/249.out @@ -0,0 +1,35 @@ +QA output created by 249 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576 +Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int +{"return": {}} + +=== Send a write command to a drive opened in read-only mode (1) + +{"return": "Block node is read-onlyrn"} + +=== Run block-commit on base using an invalid filter node name + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} +{"error": {"class": "GenericError", "desc": "Invalid node name"}} + +=== Send a write command to a drive opened in read-only mode (2) + +{"return": "Block node is read-onlyrn"} + +=== Run block-commit on base using the default filter node name + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}} +{"return": {}} + +=== Send a write command to a drive opened in read-only mode (3) + +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} +{"return": "Block node is read-onlyrn"} +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index bae7718380..7ac9a5ea4a 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -248,3 +248,4 @@ 246 rw auto quick 247 rw auto quick 248 rw auto quick +249 rw auto quick -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 2/2] iotests: Check that images are in read-only mode after block-commit @ 2019-04-26 20:57 ` Max Reitz 0 siblings, 0 replies; 12+ messages in thread From: Max Reitz @ 2019-04-26 20:57 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Eric Blake, qemu-block, Kevin Wolf [-- Attachment #1: Type: text/plain, Size: 2535 bytes --] On 11.04.19 14:32, Alberto Garcia wrote: > This tests the fix from the previous patch. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > --- > tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/249.out | 35 ++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 151 insertions(+) > create mode 100755 tests/qemu-iotests/249 > create mode 100644 tests/qemu-iotests/249.out > > diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 > new file mode 100755 > index 0000000000..a6ee2ef492 > --- /dev/null > +++ b/tests/qemu-iotests/249 > @@ -0,0 +1,115 @@ > +#!/usr/bin/env bash > +# > +# Test that a backing image is put back in read-only mode after > +# block-commit (both when it fails and when it succeeds). > +# > +# Copyright (C) 2019 Igalia, S.L. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > +# > + > +# creator > +owner=berto@igalia.com > + > +seq=`basename $0` I have been berated for not using $() here... > +echo "QA output created by $seq" > + > +here=`pwd` ...and including this line here, so I suppose I'll pass that criticism along. O:-) Otherwise, the test looks good to me, just one thing... [...] > +echo > +echo '=== Run block-commit on base using the default filter node name' > +echo > +_send_qemu_cmd $QEMU_HANDLE \ > + "{ 'execute': 'block-commit', > + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \ > + 'return' > + > +# Wait for block-commit to finish > +sleep 0.5 Why not just _send_qemu_cmd $QEMU_HANDLE '' \ '"status": "null"' ? First, that would avoid timing issues. Second, this places all the job logs above the "=== Send a write command [...] (3)" line. Max > +echo > +echo '=== Send a write command to a drive opened in read-only mode (3)' > +echo [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 2/2] iotests: Check that images are in read-only mode after block-commit @ 2019-04-26 20:57 ` Max Reitz 0 siblings, 0 replies; 12+ messages in thread From: Max Reitz @ 2019-04-26 20:57 UTC (permalink / raw) To: Alberto Garcia, qemu-devel; +Cc: Kevin Wolf, qemu-block [-- Attachment #1: Type: text/plain, Size: 2535 bytes --] On 11.04.19 14:32, Alberto Garcia wrote: > This tests the fix from the previous patch. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > --- > tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/249.out | 35 ++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 151 insertions(+) > create mode 100755 tests/qemu-iotests/249 > create mode 100644 tests/qemu-iotests/249.out > > diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 > new file mode 100755 > index 0000000000..a6ee2ef492 > --- /dev/null > +++ b/tests/qemu-iotests/249 > @@ -0,0 +1,115 @@ > +#!/usr/bin/env bash > +# > +# Test that a backing image is put back in read-only mode after > +# block-commit (both when it fails and when it succeeds). > +# > +# Copyright (C) 2019 Igalia, S.L. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > +# > + > +# creator > +owner=berto@igalia.com > + > +seq=`basename $0` I have been berated for not using $() here... > +echo "QA output created by $seq" > + > +here=`pwd` ...and including this line here, so I suppose I'll pass that criticism along. O:-) Otherwise, the test looks good to me, just one thing... [...] > +echo > +echo '=== Run block-commit on base using the default filter node name' > +echo > +_send_qemu_cmd $QEMU_HANDLE \ > + "{ 'execute': 'block-commit', > + 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \ > + 'return' > + > +# Wait for block-commit to finish > +sleep 0.5 Why not just _send_qemu_cmd $QEMU_HANDLE '' \ '"status": "null"' ? First, that would avoid timing issues. Second, this places all the job logs above the "=== Send a write command [...] (3)" line. Max > +echo > +echo '=== Send a write command to a drive opened in read-only mode (3)' > +echo [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure @ 2019-04-26 14:02 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-26 14:02 UTC (permalink / raw) To: qemu-devel; +Cc: Eric Blake, qemu-block, Kevin Wolf, Max Reitz ping On Thu 11 Apr 2019 02:32:26 PM CEST, Alberto Garcia wrote: > Hi, > > this is the same patch I posted yesterday, but with a test case. > > Berto > > Alberto Garcia (2): > commit: Make base read-only if there is an early failure > iotests: Check that images are in read-only mode after block-commit > > block/commit.c | 3 ++ > tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/249.out | 35 ++++++++++++++ > tests/qemu-iotests/group | 1 + > 4 files changed, 154 insertions(+) > create mode 100755 tests/qemu-iotests/249 > create mode 100644 tests/qemu-iotests/249.out > > -- > 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure @ 2019-04-26 14:02 ` Alberto Garcia 0 siblings, 0 replies; 12+ messages in thread From: Alberto Garcia @ 2019-04-26 14:02 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, qemu-block, Max Reitz ping On Thu 11 Apr 2019 02:32:26 PM CEST, Alberto Garcia wrote: > Hi, > > this is the same patch I posted yesterday, but with a test case. > > Berto > > Alberto Garcia (2): > commit: Make base read-only if there is an early failure > iotests: Check that images are in read-only mode after block-commit > > block/commit.c | 3 ++ > tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/249.out | 35 ++++++++++++++ > tests/qemu-iotests/group | 1 + > 4 files changed, 154 insertions(+) > create mode 100755 tests/qemu-iotests/249 > create mode 100644 tests/qemu-iotests/249.out > > -- > 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-04-26 20:58 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-04-11 12:32 [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure Alberto Garcia 2019-04-11 12:32 ` Alberto Garcia 2019-04-11 12:32 ` [Qemu-devel] [PATCH for-4.1 v2 1/2] " Alberto Garcia 2019-04-11 12:32 ` Alberto Garcia 2019-04-26 20:43 ` Max Reitz 2019-04-26 20:43 ` Max Reitz 2019-04-11 12:32 ` [Qemu-devel] [PATCH for-4.1 v2 2/2] iotests: Check that images are in read-only mode after block-commit Alberto Garcia 2019-04-11 12:32 ` Alberto Garcia 2019-04-26 20:57 ` Max Reitz 2019-04-26 20:57 ` Max Reitz 2019-04-26 14:02 ` [Qemu-devel] [PATCH for-4.1 v2 0/2] commit: Make base read-only if there is an early failure Alberto Garcia 2019-04-26 14:02 ` Alberto Garcia
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.