tree 036ffed1e7ca8bed9042bcaf19f439b1065dbf01
parent 64afc2b4d48fb21e085517c38a59a3f61a11283c
parent 02ffb504485f0920cfc75a0982a602f824a9a4f4
author Anthony Liguori <aliguori@us.ibm.com> 1369421245 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1369421245 -0500

Merge remote-tracking branch 'stefanha/block' into staging

# By Wenchao Xia (5) and others
# Via Stefan Hajnoczi
* stefanha/block:
  coroutine: stop using AioContext in CoQueue
  coroutine: protect global pool with a mutex
  qemu-iotests: Try creating huge qcow2 image
  qcow2.py: Subcommand for changing header fields
  qemu-io: Fix 'map' output
  blockdev: Rename BlockdevAction -> TransactionAction
  block: make all steps in qmp_transaction() as callback
  block: package rollback code in qmp_transaction()
  block: package committing code in qmp_transaction()
  block: move input parsing code in qmp_transaction()
  block: package preparation code in qmp_transaction()

Message-id: 1369405947-14818-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>