0153d2f50b
Now that QAPI supports boxed types, we can have unions at the top level of a command, so let's put our real options directly there for blockdev-add instead of having a single "options" dict that contains the real arguments. blockdev-add is still experimental and we already made substantial changes to the API recently, so we're free to make changes like this one, too. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
144 lines
3.8 KiB
Bash
Executable File
144 lines
3.8 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`
|
|
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": {
|
|
"driver": "$IMGFMT",
|
|
"node-name": "disk",
|
|
"file": {
|
|
"driver": "file",
|
|
"filename": "$TEST_IMG"
|
|
}
|
|
}
|
|
}
|
|
{ "execute": "query-named-block-nodes" }
|
|
{ "execute": "device_add",
|
|
"arguments": { "driver": "virtio-blk", "drive": "disk",
|
|
"id": "virtio0" } }
|
|
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
|
|
{ "execute": "system_reset" }
|
|
{ "execute": "query-named-block-nodes" }
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
# success, all done
|
|
echo "*** done"
|
|
rm -f $seq.full
|
|
status=0
|