qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL v2 11/44] iotests: Add test for relative backing file names
Date: Mon, 12 Jan 2015 16:40:01 +0000	[thread overview]
Message-ID: <1421080834-14724-12-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1421080834-14724-1-git-send-email-stefanha@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Sometimes, qemu does not have a filename to work with, so it does not
know which directory to use for a backing file specified by a relative
filename. Add a test which tests that qemu exits with an appropriate
error message.

Additionally, add a test for qemu-img create with a backing filename
relative to the backed image's base directory while omitting the image
size.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/110     | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/110.out | 19 ++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 114 insertions(+)
 create mode 100755 tests/qemu-iotests/110
 create mode 100644 tests/qemu-iotests/110.out

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
new file mode 100755
index 0000000..a687f95
--- /dev/null
+++ b/tests/qemu-iotests/110
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
+# Test case for relative backing file names in complex BDS trees
+#
+# Copyright (C) 2014 Red Hat, Inc.
+#
+# 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=mreitz@redhat.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+tmp=/tmp/$$
+status=1	# failure is the default!
+
+_cleanup()
+{
+	_cleanup_test_img
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+# Any format supporting backing files
+_supported_fmt qed qcow qcow2 vmdk
+_supported_proto file
+_supported_os Linux
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+
+TEST_IMG_REL=$(basename "$TEST_IMG")
+
+echo
+echo '=== Reconstructable filename ==='
+echo
+
+TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -b "$TEST_IMG_REL.base" 64M
+# qemu should be able to reconstruct the filename, so relative backing names
+# should work
+TEST_IMG="json:{'driver':'$IMGFMT','file':{'driver':'file','filename':'$TEST_IMG'}}" \
+    _img_info | _filter_img_info
+
+echo
+echo '=== Non-reconstructable filename ==='
+echo
+
+# Across blkdebug without a config file, you cannot reconstruct filenames, so
+# qemu is incapable of knowing the directory of the top image
+TEST_IMG="json:{
+    'driver': '$IMGFMT',
+    'file': {
+        'driver': 'blkdebug',
+        'image': {
+            'driver': 'file',
+            'filename': '$TEST_IMG'
+        },
+        'set-state': [
+            {
+                'event': 'read_aio',
+                'new_state': 42
+            }
+        ]
+    }
+}" _img_info | _filter_img_info
+
+echo
+echo '=== Backing name is always relative to the backed image ==='
+echo
+
+# omit the image size; it should work anyway
+_make_test_img -b "$TEST_IMG_REL.base"
+
+
+# success, all done
+echo '*** done'
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
new file mode 100644
index 0000000..152bacf
--- /dev/null
+++ b/tests/qemu-iotests/110.out
@@ -0,0 +1,19 @@
+QA output created by 110
+
+=== Reconstructable filename ===
+
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='t.IMGFMT.base'
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
+
+=== Non-reconstructable filename ===
+
+qemu-img: Cannot use relative backing file names for 'json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}'
+
+=== Backing name is always relative to the backed image ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='t.IMGFMT.base'
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 08099b9..f8bf354 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -112,6 +112,7 @@
 107 rw auto quick
 108 rw auto quick
 109 rw auto
+110 rw auto backing quick
 111 rw auto quick
 113 rw auto quick
 114 rw auto quick
-- 
2.1.0

  parent reply	other threads:[~2015-01-12 17:34 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-12 16:39 [Qemu-devel] [PULL v2 00/44] Block patches Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 01/44] qemu-iotests: Remove 091 from quick group Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 02/44] qemu-iotests: Speed up make check-block Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 03/44] block: mark AioContext as recursive Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 04/44] block: do not allocate an iovec per read of a growable/zero_after_eof BDS Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 05/44] block: replace g_new0 with g_new for bottom half allocation Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 06/44] checkpatch: Brace handling on multi-line condition Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 07/44] block: Get full backing filename from string Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 08/44] block: JSON filenames and relative backing files Stefan Hajnoczi
2015-01-12 16:39 ` [Qemu-devel] [PULL v2 09/44] block: Relative backing file for image creation Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 10/44] block/vmdk: Relative backing file for creation Stefan Hajnoczi
2015-01-12 16:40 ` Stefan Hajnoczi [this message]
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 12/44] qapi: Fix document for BlockStats.node-name Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 13/44] block: fix spoiling all dirty bitmaps by mirror and migration Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 14/44] qapi: Comment version info in TransactionAction Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 15/44] qmp: Add command 'blockdev-backup' Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 16/44] block: Add blockdev-backup to transaction Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 17/44] qemu-iotests: Test blockdev-backup in 055 Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 18/44] iotests: Filter out "I/O thread spun..." warning Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 19/44] migration/block: fix pending() return value Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 20/44] libqos: Convert malloc-pc allocator to a generic allocator Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 21/44] libqos: Change use of pointers to uint64_t in virtio Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 22/44] tests: Prepare virtio-blk-test for multi-arch implementation Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 23/44] libqos: Remove PCI assumptions in constants of virtio driver Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 24/44] libqos: Add malloc generic Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 25/44] libqos: Add virtio MMIO support Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 26/44] block/raw-posix.c: Fixes raw_getlength() on Mac OS X so that it reports the correct length of a real CD Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 27/44] .gitignore: Ignore generated "common.env" Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 28/44] qemu-iotests: Replace "/bin/true" with "true" Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 29/44] qemu-iotests: Add "_supported_os Linux" to 058 Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 30/44] qemu-iotests: Add supported os parameter for python tests Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 31/44] coroutine-ucontext: use __thread Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 32/44] qemu-thread: add per-thread atexit functions Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 33/44] test-coroutine: avoid overflow on 32-bit systems Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 34/44] QSLIST: add lock-free operations Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 35/44] coroutine: rewrite pool to avoid mutex Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 36/44] coroutine: drop qemu_coroutine_adjust_pool_size Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 37/44] coroutine: try harder not to delete coroutines Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 38/44] block: limited request size in write zeroes unsupported path Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 39/44] block: Split BLOCK_OP_TYPE_COMMIT to BLOCK_OP_TYPE_COMMIT_{SOURCE, TARGET} Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 40/44] ide: Implement VPD response for ATAPI Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 41/44] nvme: Fix get/set number of queues feature Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 42/44] MAINTAINERS: Update email addresses for Chrysostomos Nanakos Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 43/44] MAINTAINERS: Add migration/block* to block subsystem Stefan Hajnoczi
2015-01-12 16:40 ` [Qemu-devel] [PULL v2 44/44] NVMe: Set correct VS Value for 1.1 Compliant Controllers Stefan Hajnoczi
2015-01-12 21:43 ` [Qemu-devel] [PULL v2 00/44] Block patches Peter Maydell
2015-01-13 13:19   ` Stefan Hajnoczi

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=1421080834-14724-12-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).