The relative ordering of "device_del" return value and the "DEVICE_DELETED" QMP event depends on the architecture being tested. On x86 unplugging virtio disks is asynchronous (=qdev_unplug()= → =hotplug_handler_unplug_request()=) while on s390x it is synchronous (=qdev_unplug()= → =hotplug_handler_unplug()=). This leads to the actual output on s390x consistently differing from the reference output (that was probably produced on x86). The easiest way to address this is to filter out QMP events in 067. The DEVICE_DELETED event is already getting explicitly tested by the Python-based test case 139, so the test coverage should be unaffected. Make use of the recently introduced _filter_qmp_events() to remove QMP events from the test case output and adjust the reference output accordingly. The tr / sed / tr trick used for filtering was suggested by Max Reitz <mreitz@redhat.com>. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Message-id: 1455886869-139916-2-git-send-email-silbe@linux.vnet.ibm.com Signed-off-by: Max Reitz <mreitz@redhat.com>
147 lines
3.9 KiB
Bash
Executable file
147 lines
3.9 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Test automatic deletion of BDSes created by -drive/drive_add
|
|
#
|
|
# Copyright (C) 2013 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!
|
|
|
|
# get standard environment, filters and checks
|
|
. ./common.rc
|
|
. ./common.filter
|
|
|
|
_supported_fmt qcow2
|
|
_supported_proto file
|
|
_supported_os Linux
|
|
# Because anything other than 16 would change the output of query-block
|
|
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
|
|
|
|
function do_run_qemu()
|
|
{
|
|
echo Testing: "$@"
|
|
$QEMU -nographic -qmp-pretty stdio -serial none "$@"
|
|
echo
|
|
}
|
|
|
|
# Remove QMP events from (pretty-printed) output. Doesn't handle
|
|
# nested dicts correctly, but we don't get any of those in this test.
|
|
_filter_qmp_events()
|
|
{
|
|
tr '\n' '\t' | sed -e \
|
|
's/{\s*"timestamp":\s*{[^}]*},\s*"event":[^,}]*\(,\s*"data":\s*{[^}]*}\)\?\s*}\s*//g' \
|
|
| tr '\t' '\n'
|
|
}
|
|
|
|
function run_qemu()
|
|
{
|
|
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
|
|
| sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \
|
|
| _filter_generated_node_ids | _filter_qmp_events
|
|
}
|
|
|
|
size=128M
|
|
|
|
_make_test_img $size
|
|
|
|
echo
|
|
echo === -drive/-device and device_del ===
|
|
echo
|
|
|
|
run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0 <<EOF
|
|
{ "execute": "qmp_capabilities" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
|
|
{ "execute": "system_reset" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
echo
|
|
echo === -drive/device_add and device_del ===
|
|
echo
|
|
|
|
run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk <<EOF
|
|
{ "execute": "qmp_capabilities" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "device_add",
|
|
"arguments": { "driver": "virtio-blk", "drive": "disk",
|
|
"id": "virtio0" } }
|
|
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
|
|
{ "execute": "system_reset" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
echo
|
|
echo === drive_add/device_add and device_del ===
|
|
echo
|
|
|
|
run_qemu <<EOF
|
|
{ "execute": "qmp_capabilities" }
|
|
{ "execute": "human-monitor-command",
|
|
"arguments": { "command-line": "drive_add 0 file=$TEST_IMG,format=$IMGFMT,if=none,id=disk" } }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "device_add",
|
|
"arguments": { "driver": "virtio-blk", "drive": "disk",
|
|
"id": "virtio0" } }
|
|
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
|
|
{ "execute": "system_reset" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
echo
|
|
echo === blockdev_add/device_add and device_del ===
|
|
echo
|
|
|
|
run_qemu <<EOF
|
|
{ "execute": "qmp_capabilities" }
|
|
{ "execute": "blockdev-add",
|
|
"arguments": {
|
|
"options": {
|
|
"driver": "$IMGFMT",
|
|
"id": "disk",
|
|
"file": {
|
|
"driver": "file",
|
|
"filename": "$TEST_IMG"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
{ "execute": "query-block" }
|
|
{ "execute": "device_add",
|
|
"arguments": { "driver": "virtio-blk", "drive": "disk",
|
|
"id": "virtio0" } }
|
|
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
|
|
{ "execute": "system_reset" }
|
|
{ "execute": "query-block" }
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
# success, all done
|
|
echo "*** done"
|
|
rm -f $seq.full
|
|
status=0
|