Browse Source
- file-posix: Check correct file type (regular file for 'file', character or block device for 'host_device'/'host_cdrom') - scsi-disk: Block Device Characteristics emulation fix - qemu-img: Consider required alignment for sparse area detection - Documentation and test improvements -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJbR4HdAAoJEH8JsnLIjy/WJEwQALuwhKqj1UBNKQ67yU8NF9O4 pVEoEnghqxlg6qOD+GEwgaiN433LeTsiuhfgo4REWzwrz5133OJGGZqx+GQITOQq aHANLZrmid1hYfdYvlh0qWXLbVir+1iGySIp1RIkePSINVdS+8BZOKXlOj511VJa MYiNX/k0/+7e6DfdgweDyqRprZ79EQthiYYs3OZCv/d53NNLZSF7fmxeNilbD4sn a+zuKeh5zIlP0YBAiybE+TW1nt8rTFAfEzkY2J63Ho2e9+Y7ktnJZWW9HSkz7/Kz M8M6i03KemT4vniC4RSI6waJCkniQEzvOTCTfmTgn90fkzqxtQ3hTFzT1pPQTy8u QYHXWRm2AVG74CNVOWBtPeokP2Fb5TmngKMICdrxV7WwbfSBJ+YgDnBcFYTOtDiG rWAh/9ZiiZ0jSxt1A/mt0ZetFl+5z+7cp34W2xn70QByRu6jbQ3QR6SJI1uoJD9g Lj0M/5kd5a7oX5bZoLpU1AIRreydPV2wsjxXWEEN5FCi8P/mb1ORzWpK6lO63XOi jbVWYlIqS/BSzBWSlF+bSU67RM6VTOgF1+spmwgb2HYylECXKlHNhf71hnUX54g0 D/n8uZbxRxCZsFU9ojpstaD1qipLoc6CWDsAmxsxJPAy7Cz6IaxXJjzIZuH2hwAY 4yiowDSLr534epbYPHX5 =xtsJ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches: - file-posix: Check correct file type (regular file for 'file', character or block device for 'host_device'/'host_cdrom') - scsi-disk: Block Device Characteristics emulation fix - qemu-img: Consider required alignment for sparse area detection - Documentation and test improvements # gpg: Signature made Thu 12 Jul 2018 17:29:17 BST # gpg: using RSA key 7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: qemu-img: align result of is_allocated_sectors scsi-disk: Block Device Characteristics emulation fix iotests: add test 226 for file driver types file-posix: specify expected filetypes qemu-img: Document copy offloading implications with -S and -c iotests: nbd: Stop qemu-nbd before remaking image iotests: 153: Fix dead code Signed-off-by: Peter Maydell <peter.maydell@linaro.org>pull/73/head
Peter Maydell
8 years ago
12 changed files with 226 additions and 35 deletions
@ -0,0 +1,66 @@ |
|||
#!/bin/bash |
|||
# |
|||
# This test covers expected filetypes for the file, host_cdrom and |
|||
# host_device drivers. |
|||
# |
|||
# Copyright (C) 2018 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=jsnow@redhat.com |
|||
|
|||
seq=`basename $0` |
|||
echo "QA output created by $seq" |
|||
|
|||
here=`pwd` |
|||
status=1 # failure is the default! |
|||
|
|||
_cleanup() |
|||
{ |
|||
rmdir "$TEST_IMG" |
|||
} |
|||
trap "_cleanup; exit \$status" 0 1 2 3 15 |
|||
|
|||
# get standard environment, filters and checks |
|||
. ./common.rc |
|||
. ./common.filter |
|||
. ./common.pattern |
|||
|
|||
# Generic format, but tests file-protocol specific error handling |
|||
_supported_fmt generic |
|||
_supported_proto file |
|||
_supported_os Linux |
|||
|
|||
# Create something decidedly not a file, blockdev or chardev... |
|||
mkdir "$TEST_IMG" |
|||
|
|||
for PROTO in "file" "host_device" "host_cdrom"; do |
|||
echo |
|||
echo "=== Testing with driver:$PROTO ===" |
|||
echo |
|||
echo "== Testing RO ==" |
|||
$QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir |
|||
$QEMU_IO -c "open -r -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt |
|||
echo "== Testing RW ==" |
|||
$QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir |
|||
$QEMU_IO -c "open -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt |
|||
done |
|||
|
|||
# success, all done |
|||
echo |
|||
echo "*** done" |
|||
rm -f $seq.full |
|||
status=0 |
|||
@ -0,0 +1,26 @@ |
|||
QA output created by 226 |
|||
|
|||
=== Testing with driver:file === |
|||
|
|||
== Testing RO == |
|||
can't open: A regular file was expected by the 'file' driver, but something else was given |
|||
warning: Opening a character device as a file using the 'file' driver is deprecated |
|||
== Testing RW == |
|||
can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory |
|||
warning: Opening a character device as a file using the 'file' driver is deprecated |
|||
|
|||
=== Testing with driver:host_device === |
|||
|
|||
== Testing RO == |
|||
can't open: 'host_device' driver expects either a character or block device |
|||
== Testing RW == |
|||
can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory |
|||
|
|||
=== Testing with driver:host_cdrom === |
|||
|
|||
== Testing RO == |
|||
can't open: 'host_cdrom' driver expects either a character or block device |
|||
== Testing RW == |
|||
can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory |
|||
|
|||
*** done |
|||
Loading…
Reference in new issue