The following changes since commit df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8:
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request'
into staging (2018-04-10 14:04:27 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to c1de5696d6a25b426432c147dfd7fb8a9eb86b89:
qemu-iotests: update 185 output (2018-04-10 16:34:38 +0200)
----------------------------------------------------------------
Block layer patches
----------------------------------------------------------------
Kevin Wolf (2):
qemu-iotests: Remove _supported_fmt dmg
commit/stream: Reset delay_ns
Philippe Mathieu-Daudé (1):
hw/block/pflash_cfi: fix off-by-one error
Stefan Hajnoczi (1):
qemu-iotests: update 185 output
Vladimir Sementsov-Ogievskiy (3):
iotests.py: support unsupported_fmts in main()
iotests.py: improve verify_image_format helper
iotests: blacklist bochs and cloop for 205 and 208
block/commit.c | 2 ++
block/stream.c | 2 ++
hw/block/pflash_cfi01.c | 10 ++++------
hw/block/pflash_cfi02.c | 9 ++++-----
tests/qemu-iotests/183 | 2 +-
tests/qemu-iotests/185 | 10 ++++++----
tests/qemu-iotests/185.out | 12 +++++++-----
tests/qemu-iotests/194 | 2 +-
tests/qemu-iotests/205 | 2 +-
tests/qemu-iotests/208 | 2 ++
tests/qemu-iotests/iotests.py | 19 ++++++++++++++-----
11 files changed, 44 insertions(+), 28 deletions(-)
