From: Stefan Hajnoczi Date: Tue, 30 May 2017 13:14:48 +0000 (+0100) Subject: Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b6badb6a93956e83135a9b7017997cad6ea7faf;p=qemu.git Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging # gpg: Signature made Fri 26 May 2017 08:22:27 PM BST # gpg: using RSA key 0xBDBE7B27C0DE3057 # gpg: Good signature from "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * jtc/tags/block-pull-request: block/gluster: glfs_lseek() workaround blockjob: use deferred_to_main_loop to indicate the coroutine has ended blockjob: reorganize block_job_completed_txn_abort blockjob: strengthen a bit test-blockjob-txn blockjob: group BlockJob transaction functions together blockjob: introduce block_job_cancel_async, check iostatus invariants blockjob: move iostatus reset inside block_job_user_resume blockjob: separate monitor and blockjob APIs blockjob: introduce block_job_pause/resume_all blockjob: introduce block_job_early_fail blockjob: remove iostatus_reset callback blockjob: remove unnecessary check Signed-off-by: Stefan Hajnoczi --- 7b6badb6a93956e83135a9b7017997cad6ea7faf