One block patch for qemu 2.5-rc2.

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJWVbgFAAoJEDuxQgLoOKytEoUIAILrb9wJ77ihJF2EjpRG/yBR
 lx3t7mzXlEANQlWx8fAraDRi7rZDohVtpRpKZSrnHgZ1/Hc03thMFW15gB4N2T5g
 vwgB2CjKjM+pkcobdhqUwjWhwjK6BidMMmi7dtHchGBmWd9AiPofThqP2zlxhwBa
 3WCYNjQgy5o/kXnMGV/5tlGzQmqM8hRigUusDUMQY6woWI6+R2fsBPWrYgZAis9W
 0H2oO8Uf/D0a8LdsqkAth4PDErE1A6DDGDCkECYpnLIuwXcmeQLMEKfpeNtSYATl
 pcLTru4jSZtoc6wTvejjMUeZUPkJNcrc3g6LbN3lX+pS5FObBZOTgTrw/CtkulQ=
 =++eW
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-25' into queue-block

One block patch for qemu 2.5-rc2.

# gpg: Signature made Wed Nov 25 14:30:45 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-11-25:
  qemu-iotests: Add -nographic when starting QEMU in 119 and 120

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2015-11-25 14:33:01 +01:00
commit 8c34d891b1
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'}
{'execute': 'human-monitor-command',
'arguments': {'command-line': 'qemu-io drv \"read -P 0 0 64k\"'}}
{'execute': 'quit'}" \
| $QEMU -drive id=drv,if=none,file="$TEST_IMG",driver=nbd \
| $QEMU -nographic -drive id=drv,if=none,file="$TEST_IMG",driver=nbd \
-qmp stdio -nodefaults \
| _filter_qmp | _filter_qemu_io

View File

@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'}
{'execute': 'human-monitor-command',
'arguments': {'command-line': 'qemu-io drv \"write -P 42 0 64k\"'}}
{'execute': 'quit'}" \
| $QEMU -qmp stdio -nodefaults \
| $QEMU -qmp stdio -nographic -nodefaults \
-drive id=drv,if=none,file="$TEST_IMG",driver=raw,file.driver=$IMGFMT \
| _filter_qmp | _filter_qemu_io
$QEMU_IO -c 'read -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io