• Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · 9a33c0c8
    Peter Maydell authored
    # gpg: Signature made Mon 03 Nov 2014 11:50:53 GMT using RSA key ID 81AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
    * remotes/stefanha/tags/block-pull-request: (53 commits)
      block: declare blockjobs and dataplane friends!
      block: let commit blockjob run in BDS AioContext
      block: let mirror blockjob run in BDS AioContext
      block: let stream blockjob run in BDS AioContext
      block: let backup blockjob run in BDS AioContext
      block: add bdrv_drain()
      blockjob: add block_job_defer_to_main_loop()
      blockdev: add note that block_job_cb() must be thread-safe
      blockdev: acquire AioContext in blockdev_mark_auto_del()
      blockdev: acquire AioContext in do_qmp_query_block_jobs_one()
      block: acquire AioContext in generic blockjob QMP commands
      iotests: Expand test 061
      block/qcow2: Simplify shared L2 handling in amend
      block/qcow2: Make get_refcount() global
      block/qcow2: Implement status CB for amend
      qemu-img: Fix insignificant memleak
      qemu-img: Add progress output for amend
      block: Add status callback to bdrv_amend_options()
      block: qemu-iotest 107 supports NFS
      iotests: Add test for qcow2's bdrv_make_empty
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
iscsi.c 49.9 KB