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 v2 03/65] iotests: Add test for drive-mirror with NBD target
Date: Mon, 16 Feb 2015 15:45:28 +0000 [thread overview]
Message-ID: <1424101590-7627-4-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1424101590-7627-1-git-send-email-stefanha@redhat.com>
From: Max Reitz <mreitz@redhat.com>
When the drive-mirror block job is completed, it will call bdrv_swap()
on the source and the target BDS; this should obviously not result in a
segmentation fault.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423256778-3340-4-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/094 | 81 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/094.out | 11 +++++++
tests/qemu-iotests/group | 1 +
3 files changed, 93 insertions(+)
create mode 100755 tests/qemu-iotests/094
create mode 100644 tests/qemu-iotests/094.out
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
new file mode 100755
index 0000000..27a2be2
--- /dev/null
+++ b/tests/qemu-iotests/094
@@ -0,0 +1,81 @@
+#!/bin/bash
+#
+# Test case for drive-mirror to NBD (especially bdrv_swap() on NBD BDS)
+#
+# 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=mreitz@redhat.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+tmp=/tmp/$$
+status=1 # failure is the default!
+
+trap "exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.qemu
+
+_supported_fmt generic
+_supported_proto nbd
+_supported_os Linux
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+
+_make_test_img 64M
+$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
+
+_launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
+ -nodefaults
+
+_send_qemu_cmd $QEMU_HANDLE \
+ "{'execute': 'qmp_capabilities'}" \
+ 'return'
+
+# 'format': 'nbd' is not actually "correct", but this is probably the only way
+# to test bdrv_swap() on an NBD BDS
+_send_qemu_cmd $QEMU_HANDLE \
+ "{'execute': 'drive-mirror',
+ 'arguments': {'device': 'src',
+ 'target': '$TEST_IMG',
+ 'format': 'nbd',
+ 'sync':'full',
+ 'mode':'existing'}}" \
+ 'BLOCK_JOB_READY'
+
+_send_qemu_cmd $QEMU_HANDLE \
+ "{'execute': 'block-job-complete',
+ 'arguments': {'device': 'src'}}" \
+ 'BLOCK_JOB_COMPLETE'
+
+_send_qemu_cmd $QEMU_HANDLE \
+ "{'execute': 'quit'}" \
+ 'return'
+
+wait=1 _cleanup_qemu
+
+_cleanup_test_img
+rm -f "$TEST_DIR/source.$IMGFMT"
+
+# success, all done
+echo '*** done'
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/094.out b/tests/qemu-iotests/094.out
new file mode 100644
index 0000000..b66dc07
--- /dev/null
+++ b/tests/qemu-iotests/094.out
@@ -0,0 +1,11 @@
+QA output created by 094
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/source.IMGFMT', fmt=IMGFMT size=67108864
+{"return": {}}
+{"return": {}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}
+{"return": {}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}
+{"return": {}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 4b2b93b..6e2447a 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -99,6 +99,7 @@
090 rw auto quick
091 rw auto
092 rw auto quick
+094 rw auto quick
095 rw auto quick
097 rw auto backing
098 rw auto backing quick
--
2.1.0
next prev parent reply other threads:[~2015-02-16 15:46 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 15:45 [Qemu-devel] [PULL v2 00/65] Block patches Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 01/65] nbd: Drop BDS backpointer Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 02/65] iotests: Add "wait" functionality to _cleanup_qemu Stefan Hajnoczi
2015-02-16 15:45 ` Stefan Hajnoczi [this message]
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 04/65] libqos: Split apart pc_alloc_init Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 05/65] qtest/ahci: Create ahci.h Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 06/65] libqos: create libqos.c Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 08/65] libqos: add alloc_init_flags Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 09/65] libqos: Update QGuestAllocator to be opaque Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 10/65] libqos: add pc specific interface Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 11/65] qtest/ahci: Store hba_base in AHCIQState Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 12/65] qtest/ahci: finalize AHCIQState consolidation Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 13/65] qtest/ahci: remove pcibus global Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 14/65] qtest/ahci: remove guest_malloc global Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 15/65] libqos/ahci: Functional register helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 16/65] qtest/ahci: remove getter/setter macros Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 17/65] qtest/ahci: Bookmark FB and CLB pointers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 18/65] libqos/ahci: create libqos/ahci.c Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 19/65] dataplane: endianness-aware accesses Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 20/65] libqos/ahci: Add ahci_port_select helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 21/65] libqos/ahci: Add ahci_port_clear helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 22/65] qtest/ahci: rename 'Command' to 'CommandHeader' Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 23/65] libqos/ahci: Add command header helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 24/65] libqos/ahci: Add ahci_port_check_error helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 25/65] libqos/ahci: Add ahci_port_check_interrupts helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 26/65] libqos/ahci: Add port_check_nonbusy helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 27/65] libqos/ahci: Add cmd response sanity check helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 28/65] qtest/ahci: Demagic ahci tests Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 29/65] qtest/ahci: add ahci_write_fis Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 30/65] libqos/ahci: Add ide cmd properties Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 31/65] libqos/ahci: add ahci command functions Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 32/65] libqos/ahci: add ahci command verify Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 33/65] libqos/ahci: add ahci command size setters Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 34/65] libqos/ahci: Add ahci_guest_io Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 35/65] libqos/ahci: add ahci_io Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 36/65] libqos/ahci: Add ahci_clean_mem Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 37/65] qtest/ahci: Assert sector size in identify test Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 38/65] qtest/ahci: Adding simple dma read-write test Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 39/65] nbd: fix the co_queue multi-adding bug Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 40/65] savevm: Improve error message for blocked migration Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 41/65] block: vmdk - fixed sizeof() error Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 42/65] qtest: Fix deadloop by running main loop AIO context's timers Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 43/65] qemu-io: Account IO by aio_read and aio_write Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 44/65] qtest: Add scripts/qtest.py Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 45/65] qemu-iotests: Add VM method qtest() to iotests.py Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 46/65] qemu-iotests: Allow caller to disable underscore convertion for qmp Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 47/65] qemu-iotests: Add 093 for IO throttling Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 48/65] qemu-img: Fix qemu-img convert -n Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 49/65] iotests: Add test for qemu-img convert to NBD Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 50/65] block: Lift some BDS functions to the BlockBackend Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 51/65] block: Add blk_new_open() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 52/65] block: Add Error parameter to bdrv_find_protocol() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 53/65] iotests: Add test for driver=qcow2, format=qcow2 Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 54/65] blockdev: Use blk_new_open() in blockdev_init() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connect() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 56/65] qemu-img: Use blk_new_open() in img_open() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 57/65] qemu-img: Use blk_new_open() in img_rebase() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 58/65] qemu-img: Use BlockBackend as far as possible Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 60/65] qemu-io: Use blk_new_open() in openfile() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 61/65] qemu-io: Remove "growable" option Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 62/65] qemu-io: Use BlockBackend Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 63/65] block: Clamp BlockBackend requests Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 64/65] block: Remove "growable" from BDS Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 65/65] block: Keep bdrv_check*_request()'s return value Stefan Hajnoczi
2015-02-24 13:57 ` [Qemu-devel] [PULL v2 00/65] Block patches Peter Maydell
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=1424101590-7627-4-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).