diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 15:42:22 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 15:42:23 +0000 |
| commit | a77beb0fcbf419aa1e8e32b7df3609664f74c928 (patch) | |
| tree | 79de90ce98315d2338f1b57254195c10277f1966 /tests | |
| parent | 736986fad31cd0f25cec89138a566f6938935a29 (diff) | |
| parent | ff569b9424d1e6c7144dbe7d76ea50f5c11d4a1c (diff) | |
| download | qemu-a77beb0fcbf419aa1e8e32b7df3609664f74c928.zip qemu-a77beb0fcbf419aa1e8e32b7df3609664f74c928.tar.gz qemu-a77beb0fcbf419aa1e8e32b7df3609664f74c928.tar.bz2 | |
Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging
Block layer patches for 2.8.0-rc0
# gpg: Signature made Fri 11 Nov 2016 03:46:12 PM GMT
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* kwolf/tags/for-upstream:
raw-posix: Rename 'raw_s' to 'rs'
iotests: Always use -machine accel=qtest
iotests: Skip test 162 if there is no SSH support
block: Emit modules in bdrv_iterate_format()
block: Fix bdrv_iterate_format() sorting
nfs: Fix memory leak in nfs_file_create()
qcow2: Remove stale FIXME comment
raw_bsd: don't check size alignment when only offset is set
raw_bsd: move check to prevent overflow
hmp: Make block_stream set an explicit job ID
block/ssh: Code cleanup for unused parameter
block/nbd: Fix the leaked visitor
Message-id: 1478883311-24052-1-git-send-email-kwolf@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/162 | 3 | ||||
| -rw-r--r-- | tests/qemu-iotests/common | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.qemu | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index f8eecb3..cad2bd7 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -35,6 +35,9 @@ status=1 # failure is the default! _supported_fmt generic _supported_os Linux +test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)') +[ "$test_ssh" = "" ] && _notrun "ssh support required" + echo echo '=== NBD ===' # NBD expects all of its arguments to be strings diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index d60ea2c..b6274be 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -51,7 +51,7 @@ export IMGOPTS="" export CACHEMODE="writeback" export QEMU_IO_OPTIONS="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults" +export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index 2548a87..e657361 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -155,15 +155,13 @@ function _launch_qemu() if [ -z "$keep_stderr" ]; then QEMU_NEED_PID='y'\ - ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \ - >"${fifo_out}" \ - 2>&1 \ - <"${fifo_in}" & + ${QEMU} -nographic -serial none ${comm} "${@}" >"${fifo_out}" \ + 2>&1 \ + <"${fifo_in}" & elif [ "$keep_stderr" = "y" ]; then QEMU_NEED_PID='y'\ - ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \ - >"${fifo_out}" \ - <"${fifo_in}" & + ${QEMU} -nographic -serial none ${comm} "${@}" >"${fifo_out}" \ + <"${fifo_in}" & else exit 1 fi |