From: Max Reitz <mreitz@redhat.com> To: qemu-block@nongnu.org Cc: Kevin Wolf <kwolf@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>, qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 41/42] iotests: Add test for commit in sub directory Date: Fri, 9 Aug 2019 18:14:06 +0200 Message-ID: <20190809161407.11920-42-mreitz@redhat.com> (raw) In-Reply-To: <20190809161407.11920-1-mreitz@redhat.com> Add a test for committing an overlay in a sub directory to one of the images in its backing chain, using both relative and absolute filenames. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/020 | 36 ++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/020.out | 10 ++++++++++ 2 files changed, 46 insertions(+) diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 6b0ebb37d2..94633c3a32 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -31,6 +31,11 @@ _cleanup() _cleanup_test_img rm -f "$TEST_IMG.base" rm -f "$TEST_IMG.orig" + + rm -f "$TEST_DIR/subdir/t.$IMGFMT.base" + rm -f "$TEST_DIR/subdir/t.$IMGFMT.mid" + rm -f "$TEST_DIR/subdir/t.$IMGFMT" + rmdir "$TEST_DIR/subdir" &> /dev/null } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -133,6 +138,37 @@ $QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io $QEMU_IMG commit "$TEST_IMG" _cleanup + +echo +echo 'Testing commit in sub-directory with relative filenames' +echo + +pushd "$TEST_DIR" > /dev/null + +mkdir subdir + +TEST_IMG="subdir/t.$IMGFMT.base" _make_test_img 1M +TEST_IMG="subdir/t.$IMGFMT.mid" _make_test_img -b "t.$IMGFMT.base" +TEST_IMG="subdir/t.$IMGFMT" _make_test_img -b "t.$IMGFMT.mid" + +# Should work +$QEMU_IMG commit -b "t.$IMGFMT.mid" "subdir/t.$IMGFMT" + +# Might theoretically work, but does not in practice (we have to +# decide between this and the above; and since we always represent +# backing file names as relative to the overlay, we go for the above) +$QEMU_IMG commit -b "subdir/t.$IMGFMT.mid" "subdir/t.$IMGFMT" 2>&1 | \ + _filter_imgfmt + +# This should work as well +$QEMU_IMG commit -b "$TEST_DIR/subdir/t.$IMGFMT.mid" "subdir/t.$IMGFMT" + +popd > /dev/null + +# Now let's try with just absolute filenames +$QEMU_IMG commit -b "$TEST_DIR/subdir/t.$IMGFMT.mid" \ + "$TEST_DIR/subdir/t.$IMGFMT" + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/020.out b/tests/qemu-iotests/020.out index 4b722b2dd0..228c37dded 100644 --- a/tests/qemu-iotests/020.out +++ b/tests/qemu-iotests/020.out @@ -1094,4 +1094,14 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=json:{'driv wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qemu-img: Block job failed: No space left on device + +Testing commit in sub-directory with relative filenames + +Formatting 'subdir/t.IMGFMT.base', fmt=IMGFMT size=1048576 +Formatting 'subdir/t.IMGFMT.mid', fmt=IMGFMT size=1048576 backing_file=t.IMGFMT.base +Formatting 'subdir/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=t.IMGFMT.mid +Image committed. +qemu-img: Did not find 'subdir/t.IMGFMT.mid' in the backing chain of 'subdir/t.IMGFMT' +Image committed. +Image committed. *** done -- 2.21.0
next prev parent reply index Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 16:13 [Qemu-devel] [PATCH v6 00/42] block: Deal with filters Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 01/42] block: Mark commit and mirror as filter drivers Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 02/42] copy-on-read: Support compressed writes Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 03/42] throttle: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 04/42] block: Add child access functions Max Reitz 2019-08-09 16:56 ` Eric Blake 2019-09-04 16:16 ` Kevin Wolf 2019-09-09 7:56 ` Max Reitz 2019-09-09 9:36 ` Kevin Wolf 2019-09-09 14:04 ` Max Reitz 2019-09-09 16:13 ` Kevin Wolf 2019-09-10 9:14 ` Max Reitz 2019-09-10 10:47 ` Kevin Wolf 2019-09-10 11:36 ` Max Reitz 2019-09-10 12:48 ` Kevin Wolf 2019-09-10 12:59 ` Max Reitz 2019-09-10 13:10 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 05/42] block: Add chain helper functions Max Reitz 2019-08-09 17:01 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 06/42] qcow2: Implement .bdrv_storage_child() Max Reitz 2019-08-09 17:07 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 07/42] block: *filtered_cow_child() for *has_zero_init() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 08/42] block: bdrv_set_backing_hd() is about bs->backing Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 09/42] block: Include filters when freezing backing chain Max Reitz 2019-08-10 13:32 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:56 ` Max Reitz 2019-09-05 13:05 ` Kevin Wolf 2019-09-09 8:02 ` Max Reitz 2019-09-09 9:40 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 10/42] block: Drop bdrv_is_encrypted() Max Reitz 2019-08-10 13:42 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 11/42] block: Add bdrv_supports_compressed_writes() Max Reitz 2019-09-05 13:11 ` Kevin Wolf 2019-09-09 8:09 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 12/42] block: Use bdrv_filtered_rw* where obvious Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 13/42] block: Use CAFs in block status functions Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 14/42] block: Use CAFs when working with backing chains Max Reitz 2019-08-10 15:19 ` Vladimir Sementsov-Ogievskiy 2019-09-05 14:05 ` Kevin Wolf 2019-09-09 8:25 ` Max Reitz 2019-09-09 9:55 ` Kevin Wolf 2019-09-09 14:08 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 15/42] block: Re-evaluate backing file handling in reopen Max Reitz 2019-08-10 16:05 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 16/42] block: Flush all children in generic code Max Reitz 2019-08-10 15:36 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:58 ` Max Reitz 2019-09-05 16:24 ` Kevin Wolf 2019-09-09 8:31 ` Max Reitz 2019-09-09 10:01 ` Kevin Wolf 2019-09-09 14:15 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 17/42] block: Use CAFs in bdrv_refresh_limits() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 18/42] block: Use CAFs in bdrv_refresh_filename() Max Reitz 2019-08-10 16:22 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 19/42] block: Use CAF in bdrv_co_rw_vmstate() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 20/42] block/snapshot: Fix fallback Max Reitz 2019-08-10 16:34 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:06 ` Max Reitz 2019-09-10 11:56 ` Kevin Wolf 2019-09-10 12:04 ` Max Reitz 2019-09-10 12:49 ` Kevin Wolf 2019-09-10 13:06 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 21/42] block: Use CAFs for debug breakpoints Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 22/42] block: Fix bdrv_get_allocated_file_size's fallback Max Reitz 2019-08-10 16:41 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:09 ` Max Reitz 2019-08-12 17:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 19:15 ` Max Reitz 2019-09-10 14:52 ` Kevin Wolf 2019-09-11 6:20 ` Max Reitz 2019-09-11 6:55 ` Kevin Wolf 2019-09-11 7:37 ` Max Reitz 2019-09-11 8:27 ` Kevin Wolf 2019-09-11 10:00 ` Max Reitz 2019-09-11 10:31 ` Kevin Wolf 2019-09-11 11:00 ` Max Reitz 2019-09-12 10:34 ` Kevin Wolf 2019-11-14 13:11 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 23/42] blockdev: Use CAF in external_snapshot_prepare() Max Reitz 2019-09-10 15:02 ` Kevin Wolf 2019-09-11 6:21 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 24/42] block: Use child access functions for QAPI queries Max Reitz 2019-08-10 16:57 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 25/42] mirror: Deal with filters Max Reitz 2019-08-12 11:09 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:26 ` Max Reitz 2019-08-14 15:17 ` Vladimir Sementsov-Ogievskiy 2019-08-31 9:57 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:35 ` Max Reitz 2019-09-03 8:32 ` Vladimir Sementsov-Ogievskiy 2019-09-09 7:41 ` Max Reitz 2019-09-13 12:55 ` Kevin Wolf 2019-09-16 10:26 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 26/42] backup: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 27/42] commit: " Max Reitz 2019-08-31 10:44 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:55 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 28/42] stream: " Max Reitz 2019-08-12 11:55 ` Vladimir Sementsov-Ogievskiy 2019-09-13 14:16 ` Kevin Wolf 2019-09-16 9:52 ` Max Reitz 2019-09-16 14:47 ` Kevin Wolf 2019-12-11 12:52 ` Max Reitz 2019-12-11 15:52 ` Kevin Wolf 2019-12-11 16:12 ` Max Reitz 2019-12-11 16:35 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 29/42] nbd: Use CAF when looking for dirty bitmap Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 30/42] qemu-img: Use child access functions Max Reitz 2019-08-12 12:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:28 ` Max Reitz 2019-08-14 16:04 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 31/42] block: Drop backing_bs() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 32/42] block: Make bdrv_get_cumulative_perm() public Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 33/42] blockdev: Fix active commit choice Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 34/42] block: Inline bdrv_co_block_status_from_*() Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 35/42] block: Fix check_to_replace_node() Max Reitz 2019-08-15 15:21 ` Vladimir Sementsov-Ogievskiy 2019-08-15 17:01 ` Max Reitz 2019-08-16 11:01 ` Vladimir Sementsov-Ogievskiy 2019-08-16 13:30 ` Max Reitz 2019-08-16 14:24 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 36/42] iotests: Add tests for mirror @replaces loops Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 37/42] block: Leave BDS.backing_file constant Max Reitz 2019-08-16 16:16 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 38/42] iotests: Let complete_and_wait() work with commit Max Reitz 2019-08-23 5:59 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 39/42] iotests: Add filter commit test cases Max Reitz 2019-08-31 11:41 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:06 ` Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:09 ` Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 40/42] iotests: Add filter mirror " Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` Max Reitz [this message] 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 42/42] iotests: Test committing to overridden backing Max Reitz 2019-09-03 9:18 ` Vladimir Sementsov-Ogievskiy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190809161407.11920-42-mreitz@redhat.com \ --to=mreitz@redhat.com \ --cc=kwolf@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=vsementsov@virtuozzo.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git