The following changes since commit e00fcfeab3d452cba3d0a08991a39ab15df66424:
Merge remote-tracking branch
'remotes/awilliam/tags/vfio-pci-for-qemu-20140602.0' into staging (2014-06-03
14:37:43 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 2e95fa17196aa12e7e522925ad420000162153d0:
qapi: Extract qapi/block.json definitions (2014-06-06 16:25:48 +0200)
----------------------------------------------------------------
Block pull request
----------------------------------------------------------------
Benoît Canet (4):
qapi: Extract qapi/common.json definitions
qapi: create two block related json modules
qapi: Extract qapi/block-core.json definitions
qapi: Extract qapi/block.json definitions
Fam Zheng (4):
block: Move declaration of bdrv_get_aio_context to block.h
virtio-blk: Allow config-wce in dataplane
virtio-blk: Factor out virtio_blk_handle_scsi_req from
virtio_blk_handle_scsi
dataplane: Support VIRTIO_BLK_T_SCSI_CMD
Hitoshi Mitake (2):
sheepdog: fix vdi object update after live snapshot
sheepdog: reload only header in a case of live snapshot
Kevin Wolf (1):
rbd: Fix leaks in rbd_start_aio() error path
Max Reitz (1):
qemu-img: Document check exit codes
Stefan Hajnoczi (29):
aio: fix qemu_bh_schedule() bh->ctx race condition
block: use BlockDriverState AioContext
block: acquire AioContext in bdrv_*_all()
block: acquire AioContext in bdrv_drain_all()
block: add bdrv_set_aio_context()
blkdebug: use BlockDriverState's AioContext
blkverify: implement .bdrv_detach/attach_aio_context()
curl: implement .bdrv_detach/attach_aio_context()
gluster: use BlockDriverState's AioContext
iscsi: implement .bdrv_detach/attach_aio_context()
nbd: implement .bdrv_detach/attach_aio_context()
nfs: implement .bdrv_detach/attach_aio_context()
qed: use BlockDriverState's AioContext
quorum: implement .bdrv_detach/attach_aio_context()
block/raw-posix: implement .bdrv_detach/attach_aio_context()
block/linux-aio: fix memory and fd leak
block/raw-win32: create one QEMUWin32AIOState per BDRVRawState
block/raw-win32: implement .bdrv_detach/attach_aio_context()
rbd: use BlockDriverState's AioContext
sheepdog: implement .bdrv_detach/attach_aio_context()
ssh: use BlockDriverState's AioContext
vmdk: implement .bdrv_detach/attach_aio_context()
dataplane: use the QEMU block layer for I/O
dataplane: delete IOQueue since it is no longer used
dataplane: implement async flush
raw-posix: drop raw_get_aio_fd() since it is no longer used
throttle: add throttle_detach/attach_aio_context()
throttle: add detach/attach test case
blockdev: acquire AioContext in block_set_io_throttle
chai wen (1):
block: fix wrong order in live block migration setup
async.c | 14 +-
block-migration.c | 3 +-
block.c | 140 +++-
block/blkdebug.c | 2 +-
block/blkverify.c | 47 +-
block/curl.c | 192 +++--
block/gluster.c | 7 +-
block/iscsi.c | 80 +-
block/linux-aio.c | 24 +-
block/nbd-client.c | 24 +-
block/nbd-client.h | 4 +
block/nbd.c | 87 +-
block/nfs.c | 81 +-
block/qed-table.c | 8 +-
block/qed.c | 35 +-
block/quorum.c | 48 +-
block/raw-aio.h | 8 +
block/raw-posix.c | 82 +-
block/raw-win32.c | 54 +-
block/rbd.c | 10 +-
block/sheepdog.c | 167 ++--
block/ssh.c | 36 +-
block/vmdk.c | 23 +
block/win32-aio.c | 27 +-
blockdev.c | 6 +
hw/block/dataplane/Makefile.objs | 2 +-
hw/block/dataplane/ioq.c | 117 ---
hw/block/dataplane/ioq.h | 57 --
hw/block/dataplane/virtio-blk.c | 256 +++---
hw/block/virtio-blk.c | 83 +-
include/block/block.h | 27 +-
include/block/block_int.h | 35 +-
include/hw/virtio/virtio-blk.h | 3 +
include/qemu/throttle.h | 10 +
qapi-schema.json | 1667 +-------------------------------------
qapi/block-core.json | 1412 ++++++++++++++++++++++++++++++++
qapi/block.json | 166 ++++
qapi/common.json | 89 ++
qemu-img.c | 9 +-
qemu-img.texi | 23 +
tests/test-throttle.c | 49 +-
util/throttle.c | 27 +-
42 files changed, 2833 insertions(+), 2408 deletions(-)
delete mode 100644 hw/block/dataplane/ioq.c
delete mode 100644 hw/block/dataplane/ioq.h
create mode 100644 qapi/block-core.json
create mode 100644 qapi/block.json
create mode 100644 qapi/common.json
--
1.9.3
