The following changes since commit 411f491e0af173cf8f39347574941bd26fbae381:
Merge remote-tracking branch 'remotes/rth/tags/tgt-axp-pull-20140424' into
staging (2014-04-25 13:25:22 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 172fc4dd33e604dcf868c28e73398c19e161708b:
iscsi: Don't use error_is_set() to suppress additional errors (2014-04-25
18:05:06 +0200)
----------------------------------------------------------------
Block pull request
----------------------------------------------------------------
BenoƮt Canet (1):
block: Prevent coroutine stack overflow when recursing in
bdrv_open_backing_file.
Fam Zheng (1):
qemu-iotests: Improve and make use of QMPTestCase.wait_until_completed()
Kevin Wolf (2):
MAINTAINERS: Add qemu-img/io to block subsystem
block: Expose host_* drivers in blockdev-add
Markus Armbruster (5):
Use error_is_set() only when necessary (again)
qemu-img: Consistently name Error * objects err, and not errp
nbd: Use return values instead of error_is_set(errp)
blockdev: Clean up fragile use of error_is_set()
iscsi: Don't use error_is_set() to suppress additional errors
Stefan Hajnoczi (1):
doc: add -drive rerror=,werror= to qemu --help output
MAINTAINERS | 2 ++
block.c | 35 ++++++++++++++++--------------
block/iscsi.c | 9 ++++----
block/mirror.c | 2 +-
block/nbd.c | 2 +-
block/nfs.c | 2 +-
block/quorum.c | 4 ++--
blockdev.c | 7 ++++--
docs/writing-qmp-commands.txt | 6 +++---
qapi-schema.json | 8 ++++++-
qemu-img.c | 12 +++++------
qemu-options.hx | 3 ++-
tests/qemu-iotests/030 | 50 +++++--------------------------------------
tests/qemu-iotests/056 | 9 +-------
tests/qemu-iotests/iotests.py | 5 +++--
tests/test-qmp-input-strict.c | 8 +++----
16 files changed, 66 insertions(+), 98 deletions(-)
--
1.9.0