block: Remove inner quotation marks in iotest 085

This patch removes the inner quotation marks in all cases like this:

   cmd=" ... "${variable}" ... "

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2015-11-03 12:32:36 +02:00 committed by Kevin Wolf
parent 08b24cfe37
commit f2d7f16f94

View file

@ -65,7 +65,7 @@ function create_single_snapshot()
{ {
cmd="{ 'execute': 'blockdev-snapshot-sync', cmd="{ 'execute': 'blockdev-snapshot-sync',
'arguments': { 'device': 'virtio0', 'arguments': { 'device': 'virtio0',
'snapshot-file':'"${TEST_DIR}/${1}-${snapshot_virt0}"', 'snapshot-file':'${TEST_DIR}/${1}-${snapshot_virt0}',
'format': 'qcow2' } }" 'format': 'qcow2' } }"
_send_qemu_cmd $h "${cmd}" "return" _send_qemu_cmd $h "${cmd}" "return"
} }
@ -77,10 +77,10 @@ function create_group_snapshot()
{'actions': [ {'actions': [
{ 'type': 'blockdev-snapshot-sync', 'data' : { 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio0', { 'device': 'virtio0',
'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt0}"' } }, 'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt0}' } },
{ 'type': 'blockdev-snapshot-sync', 'data' : { 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio1', { 'device': 'virtio1',
'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt1}"' } } ] 'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt1}' } } ]
} }" } }"
_send_qemu_cmd $h "${cmd}" "return" _send_qemu_cmd $h "${cmd}" "return"
@ -101,9 +101,9 @@ function add_snapshot_image()
mv "${TEST_IMG}" "${snapshot_file}" mv "${TEST_IMG}" "${snapshot_file}"
cmd="{ 'execute': 'blockdev-add', 'arguments': cmd="{ 'execute': 'blockdev-add', 'arguments':
{ 'options': { 'options':
{ 'driver': 'qcow2', 'node-name': 'snap_"${1}"', "${extra_params}" { 'driver': 'qcow2', 'node-name': 'snap_${1}', ${extra_params}
'file': 'file':
{ 'driver': 'file', 'filename': '"${snapshot_file}"' } } } }" { 'driver': 'file', 'filename': '${snapshot_file}' } } } }"
_send_qemu_cmd $h "${cmd}" "return" _send_qemu_cmd $h "${cmd}" "return"
} }
@ -113,7 +113,7 @@ function blockdev_snapshot()
{ {
cmd="{ 'execute': 'blockdev-snapshot', cmd="{ 'execute': 'blockdev-snapshot',
'arguments': { 'node': 'virtio0', 'arguments': { 'node': 'virtio0',
'overlay':'snap_"${1}"' } }" 'overlay':'snap_${1}' } }"
_send_qemu_cmd $h "${cmd}" "${2:-return}" _send_qemu_cmd $h "${cmd}" "${2:-return}"
} }
@ -152,7 +152,7 @@ echo === Invalid command - missing device and nodename ===
echo echo
_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot-sync', _send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot-sync',
'arguments': { 'snapshot-file':'"${TEST_DIR}/1-${snapshot_virt0}"', 'arguments': { 'snapshot-file':'${TEST_DIR}/1-${snapshot_virt0}',
'format': 'qcow2' } }" "error" 'format': 'qcow2' } }" "error"
echo echo
@ -224,7 +224,7 @@ blockdev_snapshot $((${SNAPSHOTS}+1)) error
_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot', _send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot',
'arguments': { 'node':'nodevice', 'arguments': { 'node':'nodevice',
'overlay':'snap_"${SNAPSHOTS}"' } 'overlay':'snap_${SNAPSHOTS}' }
}" "error" }" "error"
# success, all done # success, all done