2711fd33a4
This patch fixes an io test suite issue that was introduced with the
commit c88930a686 'qemu-char: Permit only
a single "stdio" character device'. The option supresses the creation of
default devices such as the floopy and cdrom. Output files for test case
067, 071, 081 and 087 need to be updated to accommodate this change.
Use virtio-blk instead of virtio-blk-pci as the device driver for test
case 067. For virtio-blk-pci is the same with virtio-blk as device
driver but other platform such as s390 may not recognize the virtio-blk-pci.
The default devices differ across machines. As the qemu output often
contains these devices (or events for them, like opening a CD tray on
reset), the reference output currently is rather machine-specific.
All existing qemu tests explicitly configure the devices they're working
with, so just pass -nodefaults to qemu by default to disable the default
devices. Update the reference outputs accordingly.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
137 lines
3.5 KiB
Bash
Executable file
137 lines
3.5 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
|
|
}
|
|
|
|
function run_qemu()
|
|
{
|
|
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
|
|
| sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
|
|
}
|
|
|
|
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
|