qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com,
	mreitz@redhat.com
Subject: [Qemu-devel] [PATCH 34/34] qemu-iotests: Test reopen with node-name/driver options
Date: Fri,  8 May 2015 19:22:06 +0200	[thread overview]
Message-ID: <1431105726-3682-35-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1431105726-3682-1-git-send-email-kwolf@redhat.com>

'node-name' and 'driver' should not be changed during a reopen
operation. It is, however, valid to specify them with the same value as
they already had.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/133     | 90 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/133.out | 22 ++++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 113 insertions(+)
 create mode 100755 tests/qemu-iotests/133
 create mode 100644 tests/qemu-iotests/133.out

diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
new file mode 100755
index 0000000..8587102
--- /dev/null
+++ b/tests/qemu-iotests/133
@@ -0,0 +1,90 @@
+#!/bin/bash
+#
+# Test for reopen
+#
+# Copyright (C) 2015 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=kwolf@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
+
+_supported_fmt qcow2
+_supported_proto file
+_supported_os Linux
+
+TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -b "$TEST_IMG.base"
+
+echo
+echo "=== Check that node-name can't be changed ==="
+echo
+
+$QEMU_IO -c 'reopen -o node-name=foo' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.node-name=foo' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.node-name=foo' $TEST_IMG
+
+echo
+echo "=== Check that unchanged node-name is okay ==="
+echo
+
+# Explicitly repeated
+$QEMU_IO -c "open -o node-name=foo $TEST_IMG" -c 'reopen -o node-name=foo'
+$QEMU_IO -c "open -o file.node-name=foo $TEST_IMG" -c 'reopen -o file.node-name=foo'
+$QEMU_IO -c "open -o backing.node-name=foo $TEST_IMG" -c 'reopen -o backing.node-name=foo'
+
+# Implicitly retained
+$QEMU_IO -c "open -o node-name=foo $TEST_IMG" -c 'reopen'
+$QEMU_IO -c "open -o file.node-name=foo $TEST_IMG" -c 'reopen'
+$QEMU_IO -c "open -o backing.node-name=foo $TEST_IMG" -c 'reopen'
+
+echo
+echo "=== Check that driver can't be changed ==="
+echo
+
+$QEMU_IO -c 'reopen -o driver=raw' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.driver=qcow2' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.driver=file' $TEST_IMG
+
+echo
+echo "=== Check that unchanged driver is okay ==="
+echo
+
+# Explicitly repeated (implicit case is covered in node-name test)
+$QEMU_IO -c 'reopen -o driver=qcow2' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.driver=file' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.driver=qcow2' $TEST_IMG
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
new file mode 100644
index 0000000..682406f
--- /dev/null
+++ b/tests/qemu-iotests/133.out
@@ -0,0 +1,22 @@
+QA output created by 133
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.base'
+
+=== Check that node-name can't be changed ===
+
+Cannot change the option 'node-name'
+Cannot change the option 'node-name'
+Cannot change the option 'node-name'
+
+=== Check that unchanged node-name is okay ===
+
+
+=== Check that driver can't be changed ===
+
+Cannot change the option 'driver'
+Cannot change the option 'driver'
+Cannot change the option 'driver'
+
+=== Check that unchanged driver is okay ===
+
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 25f4f71..7282358 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -129,3 +129,4 @@
 129 rw auto quick
 130 rw auto quick
 132 auto
+133 auto quick
-- 
1.8.3.1

  parent reply	other threads:[~2015-05-08 17:23 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-08 17:21 [Qemu-devel] [PATCH 00/34] block: Cache mode for children, reopen overhaul and more Kevin Wolf
2015-05-08 17:21 ` [Qemu-devel] [PATCH 01/34] qdict: Add qdict_array_entries() Kevin Wolf
2015-05-08 20:06   ` Eric Blake
2015-05-08 21:22     ` Eric Blake
2015-05-11 14:40     ` Kevin Wolf
2015-05-11 15:28       ` Eric Blake
2015-05-20 14:19     ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-05-11 13:56   ` [Qemu-devel] " Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 02/34] qdict: Add qdict_{set,copy}_default() Kevin Wolf
2015-05-08 21:30   ` [Qemu-devel] [PATCH 02/34] qdict: Add qdict_{set, copy}_default() Eric Blake
2015-05-11 14:06     ` Kevin Wolf
2015-05-11 14:16   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 03/34] quorum: Use bdrv_open_image() Kevin Wolf
2015-05-08 21:33   ` Eric Blake
2015-05-11 14:27   ` Max Reitz
2015-05-12 19:07   ` [Qemu-devel] [Qemu-block] " Jeff Cody
2015-05-20 14:46   ` Alberto Garcia
2015-05-08 17:21 ` [Qemu-devel] [PATCH 04/34] vmdk: " Kevin Wolf
2015-05-08 22:00   ` Eric Blake
2015-05-11 14:35   ` Max Reitz
2015-05-12 19:12   ` [Qemu-devel] [Qemu-block] " Jeff Cody
2015-05-08 17:21 ` [Qemu-devel] [PATCH 05/34] block: Use macro for cache option names Kevin Wolf
2015-05-08 22:54   ` Eric Blake
2015-05-11 14:40   ` Max Reitz
2015-05-11 14:51     ` Kevin Wolf
2015-05-11 14:59       ` Max Reitz
2015-05-11 15:00   ` Max Reitz
2015-05-12 19:14   ` [Qemu-devel] [Qemu-block] " Jeff Cody
2015-05-20 14:49   ` Alberto Garcia
2015-05-08 17:21 ` [Qemu-devel] [PATCH 06/34] block: Use QemuOpts in bdrv_open_common() Kevin Wolf
2015-05-08 22:57   ` Eric Blake
2015-05-11 14:57   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 07/34] block: Move flag inheritance to bdrv_open_inherited() Kevin Wolf
2015-05-08 23:20   ` Eric Blake
2015-05-11 15:20   ` Max Reitz
2015-05-12 13:32     ` Kevin Wolf
2015-05-28 11:10   ` Wen Congyang
2015-05-08 17:21 ` [Qemu-devel] [PATCH 08/34] block: Add list of children to BlockDriverState Kevin Wolf
2015-05-08 23:34   ` Eric Blake
2015-05-11 15:45   ` Max Reitz
2015-05-12 14:23     ` Kevin Wolf
2015-06-10 12:09     ` Kevin Wolf
2015-06-10 13:48       ` Max Reitz
2015-05-27 11:30   ` Kevin Wolf
2015-05-08 17:21 ` [Qemu-devel] [PATCH 09/34] block: Add BlockDriverState.inherits_from Kevin Wolf
2015-05-08 23:39   ` Eric Blake
2015-05-11 15:50   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 10/34] block: Fix reopen flag inheritance Kevin Wolf
2015-05-11 16:04   ` Max Reitz
2015-05-12 14:32   ` Eric Blake
2015-05-08 17:21 ` [Qemu-devel] [PATCH 11/34] block: Allow references for backing files Kevin Wolf
2015-05-11 16:19   ` Max Reitz
2015-05-12 14:46   ` Eric Blake
2015-05-21  5:47   ` Wen Congyang
2015-05-27 12:31     ` Kevin Wolf
2015-05-27 13:30       ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2015-05-27 13:44         ` Paolo Bonzini
2015-05-28  0:59       ` [Qemu-devel] " Wen Congyang
2015-05-28  9:48         ` Kevin Wolf
2015-05-28  9:58           ` Wen Congyang
2015-06-01  2:01       ` Wen Congyang
2015-05-08 17:21 ` [Qemu-devel] [PATCH 12/34] block: Allow specifying driver-specific options to reopen Kevin Wolf
2015-05-11 16:35   ` Max Reitz
2015-05-12 14:59   ` Eric Blake
2015-05-08 17:21 ` [Qemu-devel] [PATCH 13/34] qemu-io: Add command 'reopen' Kevin Wolf
2015-05-11 16:50   ` Max Reitz
2015-05-12 15:05   ` Eric Blake
2015-05-13  8:37     ` Kevin Wolf
2015-05-08 17:21 ` [Qemu-devel] [PATCH 14/34] qcow2: Factor out qcow2_update_options() Kevin Wolf
2015-05-12 20:04   ` Eric Blake
2015-05-13  9:11     ` Kevin Wolf
2015-05-13 17:04       ` Eric Blake
2015-05-13 11:21   ` Max Reitz
2015-05-13 11:28   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 15/34] qcow2: Move qcow2_update_options() call up Kevin Wolf
2015-05-12 20:15   ` Eric Blake
2015-05-13 11:25   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 16/34] qcow2: Move rest of option handling to qcow2_update_options() Kevin Wolf
2015-05-12 20:47   ` Eric Blake
2015-05-13 11:38   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 17/34] qcow2: Leave s unchanged on qcow2_update_options() failure Kevin Wolf
2015-05-12 20:57   ` Eric Blake
2015-05-13 11:47   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 18/34] qcow2: Fix memory leak in qcow2_update_options() error path Kevin Wolf
2015-05-12 21:26   ` Eric Blake
2015-05-13 11:52   ` Max Reitz
2015-05-13 12:02     ` Kevin Wolf
2015-05-13 12:04       ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 19/34] qcow2: Make qcow2_update_options() suitable for transactions Kevin Wolf
2015-05-12 21:40   ` Eric Blake
2015-05-13  9:21     ` Kevin Wolf
2015-05-13 12:06   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 20/34] qcow2: Support updating driver-specific options in reopen Kevin Wolf
2015-05-12 21:47   ` Eric Blake
2015-05-13  9:26     ` Kevin Wolf
2015-05-08 17:21 ` [Qemu-devel] [PATCH 21/34] block: Consider all block layer options in append_open_options Kevin Wolf
2015-05-12 21:59   ` Eric Blake
2015-05-13 12:26   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 22/34] block: Exclude nested options only for children in append_open_options() Kevin Wolf
2015-05-13 12:49   ` Max Reitz
2015-05-13 12:50     ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 23/34] block: Pass driver-specific options to .bdrv_refresh_filename() Kevin Wolf
2015-05-13 12:57   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 24/34] block: Keep "driver" in bs->options Kevin Wolf
2015-05-13 13:22   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 25/34] block: Allow specifying child options in reopen Kevin Wolf
2015-05-13 13:41   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 26/34] block: reopen: Document option precedence and refactor accordingly Kevin Wolf
2015-05-13 14:47   ` Max Reitz
2015-05-08 17:21 ` [Qemu-devel] [PATCH 27/34] block: Add infrastructure for option inheritance Kevin Wolf
2015-05-13 15:10   ` Max Reitz
2015-05-13 15:28     ` Kevin Wolf
2015-05-08 17:22 ` [Qemu-devel] [PATCH 28/34] block: Introduce bs->explicit_options Kevin Wolf
2015-05-15 17:47   ` Max Reitz
2015-10-29 11:38     ` Kevin Wolf
2015-05-08 17:22 ` [Qemu-devel] [PATCH 29/34] qemu-iotests: Remove cache mode test without medium Kevin Wolf
2015-05-15 17:53   ` Max Reitz
2015-05-08 17:22 ` [Qemu-devel] [PATCH 30/34] block: reopen: Extract QemuOpts for generic block layer options Kevin Wolf
2015-05-15 18:07   ` Max Reitz
2015-05-08 17:22 ` [Qemu-devel] [PATCH 31/34] block: Move cache options into options QDict Kevin Wolf
2015-05-15 18:43   ` Max Reitz
2015-05-15 19:44     ` Eric Blake
2015-05-08 17:22 ` [Qemu-devel] [PATCH 32/34] qemu-iotests: Try setting cache mode for children Kevin Wolf
2015-05-15 18:52   ` Max Reitz
2015-05-08 17:22 ` [Qemu-devel] [PATCH 33/34] qemu-iotests: Test cache mode option inheritance Kevin Wolf
2015-05-15 19:16   ` Max Reitz
2015-05-18 14:39     ` Kevin Wolf
2015-05-18 15:32       ` Max Reitz
2015-05-08 17:22 ` Kevin Wolf [this message]
2015-05-15 19:19   ` [Qemu-devel] [PATCH 34/34] qemu-iotests: Test reopen with node-name/driver options Max Reitz

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=1431105726-3682-35-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=armbru@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.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).