The following changes since commit 99c9c3cb24e566258a0a141178934f9cb5198842:
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into staging (2014-12-11 18:27:02 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 82595da8dedde128d8004ec47441aeb720c08704: linux-aio: simplify removal of completed iocbs from the list (2014-12-12 16:57:55 +0000) ---------------------------------------------------------------- ---------------------------------------------------------------- Fam Zheng (2): qemu-iotests: Remove traling whitespaces in *.out block: Don't add trailing space in "Formating..." message Gary R Hook (1): block migration: fix return value Gonglei (1): block/rbd: fix memory leak Jeff Cody (4): block: vhdx - remove redundant comments block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec block: vhdx - change .vhdx_create default block state to ZERO block: vhdx - set .bdrv_has_zero_init to bdrv_has_zero_init_1 Max Reitz (5): vmdk: Fix error for JSON descriptor file names iotests: Add test for vmdk JSON file names qemu-io: Add sigraise command iotests: Filter for "Killed" in qemu-io output iotests: Fix test 039 Paolo Bonzini (5): linux-aio: queue requests that cannot be submitted linux-aio: track whether the queue is blocked linux-aio: rename LaioQueue idx field to "n" linux-aio: drop return code from laio_io_unplug and ioq_submit linux-aio: simplify removal of completed iocbs from the list Stefan Hajnoczi (1): block: drop unused bdrv_clear_incoming_migration_all() prototype block-migration.c | 10 +- block.c | 6 +- block/linux-aio.c | 99 ++++++------- block/raw-aio.h | 2 +- block/rbd.c | 8 +- block/vhdx.c | 18 ++- block/vhdx.h | 3 +- block/vmdk.c | 10 +- include/block/block.h | 3 +- include/qemu/option.h | 2 +- include/qemu/queue.h | 11 ++ qemu-doc.texi | 6 +- qemu-io-cmds.c | 46 ++++++ tests/qemu-iotests/001.out | 2 +- tests/qemu-iotests/002.out | 2 +- tests/qemu-iotests/003.out | 2 +- tests/qemu-iotests/004.out | 2 +- tests/qemu-iotests/005.out | 2 +- tests/qemu-iotests/006.out | 2 +- tests/qemu-iotests/007.out | 2 +- tests/qemu-iotests/008.out | 2 +- tests/qemu-iotests/009.out | 2 +- tests/qemu-iotests/010.out | 2 +- tests/qemu-iotests/011.out | 2 +- tests/qemu-iotests/012.out | 2 +- tests/qemu-iotests/013.out | 2 +- tests/qemu-iotests/014.out | 2 +- tests/qemu-iotests/015.out | 2 +- tests/qemu-iotests/016.out | 2 +- tests/qemu-iotests/017.out | 2 +- tests/qemu-iotests/018.out | 2 +- tests/qemu-iotests/019.out | 4 +- tests/qemu-iotests/020.out | 4 +- tests/qemu-iotests/021.out | 2 +- tests/qemu-iotests/022.out | 2 +- tests/qemu-iotests/023.out | 16 +-- tests/qemu-iotests/024.out | 6 +- tests/qemu-iotests/025.out | 2 +- tests/qemu-iotests/026.out | 300 +++++++++++++++++++-------------------- tests/qemu-iotests/027.out | 2 +- tests/qemu-iotests/028.out | 6 +- tests/qemu-iotests/029.out | 8 +- tests/qemu-iotests/031.out | 4 +- tests/qemu-iotests/032.out | 2 +- tests/qemu-iotests/033.out | 2 +- tests/qemu-iotests/034.out | 4 +- tests/qemu-iotests/035.out | 2 +- tests/qemu-iotests/036.out | 6 +- tests/qemu-iotests/037.out | 4 +- tests/qemu-iotests/038.out | 4 +- tests/qemu-iotests/039 | 18 ++- tests/qemu-iotests/039.out | 18 +-- tests/qemu-iotests/042.out | 2 +- tests/qemu-iotests/043.out | 52 +++---- tests/qemu-iotests/046.out | 4 +- tests/qemu-iotests/047.out | 2 +- tests/qemu-iotests/048.out | 4 +- tests/qemu-iotests/049.out | 112 +++++++-------- tests/qemu-iotests/050.out | 6 +- tests/qemu-iotests/051.out | 6 +- tests/qemu-iotests/052.out | 2 +- tests/qemu-iotests/053.out | 2 +- tests/qemu-iotests/054.out | 4 +- tests/qemu-iotests/059 | 6 + tests/qemu-iotests/059.out | 4 + tests/qemu-iotests/060.out | 22 +-- tests/qemu-iotests/061.out | 44 +++--- tests/qemu-iotests/062.out | 2 +- tests/qemu-iotests/066.out | 2 +- tests/qemu-iotests/067.out | 2 +- tests/qemu-iotests/068.out | 2 +- tests/qemu-iotests/069.out | 4 +- tests/qemu-iotests/071.out | 8 +- tests/qemu-iotests/072.out | 2 +- tests/qemu-iotests/073.out | 4 +- tests/qemu-iotests/077.out | 2 +- tests/qemu-iotests/080.out | 24 ++-- tests/qemu-iotests/081.out | 6 +- tests/qemu-iotests/082.out | 14 +- tests/qemu-iotests/084.out | 4 +- tests/qemu-iotests/086.out | 2 +- tests/qemu-iotests/087.out | 6 +- tests/qemu-iotests/088.out | 2 +- tests/qemu-iotests/089.out | 4 +- tests/qemu-iotests/090.out | 2 +- tests/qemu-iotests/091.out | 2 +- tests/qemu-iotests/092.out | 8 +- tests/qemu-iotests/095.out | 6 +- tests/qemu-iotests/097.out | 24 ++-- tests/qemu-iotests/098.out | 16 +-- tests/qemu-iotests/099.out | 4 +- tests/qemu-iotests/100.out | 14 +- tests/qemu-iotests/103.out | 2 +- tests/qemu-iotests/104.out | 4 +- tests/qemu-iotests/107.out | 2 +- tests/qemu-iotests/108.out | 12 +- tests/qemu-iotests/common.filter | 2 +- util/qemu-option.c | 10 +- 98 files changed, 619 insertions(+), 527 deletions(-) -- 2.1.0
