From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 53/65] iotests: Add test for driver=qcow2, format=qcow2
Date: Fri, 13 Feb 2015 16:24:49 +0000 [thread overview]
Message-ID: <1423844701-21041-54-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1423844701-21041-1-git-send-email-stefanha@redhat.com>
From: Max Reitz <mreitz@redhat.com>
While specifying a different driver and format is obviously invalid,
specifying the same driver once through driver and once through format
is invalid as well. Add a test for it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1423162705-32065-5-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/051 | 1 +
tests/qemu-iotests/051.out | 3 +++
2 files changed, 4 insertions(+)
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 11c858f..27138a2 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -93,6 +93,7 @@ echo
run_qemu -drive file="$TEST_IMG",format=foo
run_qemu -drive file="$TEST_IMG",driver=foo
run_qemu -drive file="$TEST_IMG",driver=raw,format=qcow2
+run_qemu -drive file="$TEST_IMG",driver=qcow2,format=qcow2
echo
echo === Overriding backing file ===
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 9596e20..e727dc1 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -43,6 +43,9 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=foo: could not open disk image TE
Testing: -drive file=TEST_DIR/t.qcow2,driver=raw,format=qcow2
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=raw,format=qcow2: could not open disk image TEST_DIR/t.qcow2: Driver specified twice
+Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: could not open disk image TEST_DIR/t.qcow2: Driver specified twice
+
=== Overriding backing file ===
--
2.1.0
next prev parent reply other threads:[~2015-02-13 16:35 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-13 16:23 [Qemu-devel] [PULL 00/65] Block patches Stefan Hajnoczi
2015-02-13 16:23 ` [Qemu-devel] [PULL 01/65] nbd: Drop BDS backpointer Stefan Hajnoczi
2015-02-13 16:23 ` [Qemu-devel] [PULL 02/65] iotests: Add "wait" functionality to _cleanup_qemu Stefan Hajnoczi
2015-02-13 16:23 ` [Qemu-devel] [PULL 03/65] iotests: Add test for drive-mirror with NBD target Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 04/65] libqos: Split apart pc_alloc_init Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 05/65] qtest/ahci: Create ahci.h Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 06/65] libqos: create libqos.c Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 07/65] libqos: add qtest_vboot Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 08/65] libqos: add alloc_init_flags Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 09/65] libqos: Update QGuestAllocator to be opaque Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 10/65] libqos: add pc specific interface Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 11/65] qtest/ahci: Store hba_base in AHCIQState Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 12/65] qtest/ahci: finalize AHCIQState consolidation Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 13/65] qtest/ahci: remove pcibus global Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 14/65] qtest/ahci: remove guest_malloc global Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 15/65] libqos/ahci: Functional register helpers Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 16/65] qtest/ahci: remove getter/setter macros Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 17/65] qtest/ahci: Bookmark FB and CLB pointers Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 18/65] libqos/ahci: create libqos/ahci.c Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 19/65] dataplane: endianness-aware accesses Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 20/65] libqos/ahci: Add ahci_port_select helper Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 21/65] libqos/ahci: Add ahci_port_clear helper Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 22/65] qtest/ahci: rename 'Command' to 'CommandHeader' Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 23/65] libqos/ahci: Add command header helpers Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 24/65] libqos/ahci: Add ahci_port_check_error helper Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 25/65] libqos/ahci: Add ahci_port_check_interrupts helper Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 26/65] libqos/ahci: Add port_check_nonbusy helper Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 27/65] libqos/ahci: Add cmd response sanity check helpers Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 28/65] qtest/ahci: Demagic ahci tests Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 29/65] qtest/ahci: add ahci_write_fis Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 30/65] libqos/ahci: Add ide cmd properties Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 31/65] libqos/ahci: add ahci command functions Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 32/65] libqos/ahci: add ahci command verify Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 33/65] libqos/ahci: add ahci command size setters Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 34/65] libqos/ahci: Add ahci_guest_io Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 35/65] libqos/ahci: add ahci_io Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 36/65] libqos/ahci: Add ahci_clean_mem Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 37/65] qtest/ahci: Assert sector size in identify test Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 38/65] qtest/ahci: Adding simple dma read-write test Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 39/65] nbd: fix the co_queue multi-adding bug Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 40/65] savevm: Improve error message for blocked migration Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 41/65] block: vmdk - fixed sizeof() error Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 42/65] qtest: Fix deadloop by running main loop AIO context's timers Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 43/65] qemu-io: Account IO by aio_read and aio_write Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 44/65] qtest: Add scripts/qtest.py Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 45/65] qemu-iotests: Add VM method qtest() to iotests.py Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 46/65] qemu-iotests: Allow caller to disable underscore convertion for qmp Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 47/65] qemu-iotests: Add 093 for IO throttling Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 48/65] qemu-img: Fix qemu-img convert -n Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 49/65] iotests: Add test for qemu-img convert to NBD Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 50/65] block: Lift some BDS functions to the BlockBackend Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 51/65] block: Add blk_new_open() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 52/65] block: Add Error parameter to bdrv_find_protocol() Stefan Hajnoczi
2015-02-13 16:24 ` Stefan Hajnoczi [this message]
2015-02-13 16:24 ` [Qemu-devel] [PULL 54/65] blockdev: Use blk_new_open() in blockdev_init() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 55/65] block/xen: Use blk_new_open() in blk_connect() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 56/65] qemu-img: Use blk_new_open() in img_open() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 57/65] qemu-img: Use blk_new_open() in img_rebase() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 58/65] qemu-img: Use BlockBackend as far as possible Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 59/65] qemu-nbd: Use blk_new_open() in main() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 60/65] qemu-io: Use blk_new_open() in openfile() Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 61/65] qemu-io: Remove "growable" option Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 62/65] qemu-io: Use BlockBackend Stefan Hajnoczi
2015-02-13 16:24 ` [Qemu-devel] [PULL 63/65] block: Clamp BlockBackend requests Stefan Hajnoczi
2015-02-13 16:25 ` [Qemu-devel] [PULL 64/65] block: Remove "growable" from BDS Stefan Hajnoczi
2015-02-13 16:25 ` [Qemu-devel] [PULL 65/65] block: Keep bdrv_check*_request()'s return value Stefan Hajnoczi
2015-02-14 0:50 ` [Qemu-devel] [PULL 00/65] Block patches Peter Maydell
2015-02-16 14:12 ` 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=1423844701-21041-54-git-send-email-stefanha@redhat.com \
--to=stefanha@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).