The following changes since commit 76462405809d29bab65a3699686998ba124ab942:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160606-1' into staging (2016-06-06 17:02:42 +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 8860eabdee32f78d9a34273a340b8f74476bc9a0: throttle: refuse iops-size without iops-total/read/write (2016-06-07 14:40:51 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Changlong Xie (1): iostatus: fix comments for block_job_iostatus_reset Eric Blake (1): block: Move BlockRequest type to io.c Fam Zheng (5): blockdev-backup: Use bdrv_lookup_bs on target blockdev-backup: Don't move target AioContext if it's attached virtio-blk: Remove op blocker for dataplane virtio-scsi: Remove op blocker for dataplane block: Drop bdrv_ioctl_bh_cb Kevin Wolf (1): block/io: Remove unused bdrv_aio_write_zeroes() Peter Lieven (1): block/io: optimize bdrv_co_pwritev for small requests Stefan Hajnoczi (3): tests: avoid coroutine pool test crash virtio: drop duplicate virtio_queue_get_id() function throttle: refuse iops-size without iops-total/read/write block/io.c | 60 +++++++++++++++++++------------------- blockdev.c | 23 ++++++++------- hw/block/dataplane/virtio-blk.c | 63 ---------------------------------------- hw/scsi/virtio-scsi.c | 64 +---------------------------------------- hw/virtio/virtio.c | 7 ----- include/block/block.h | 24 ---------------- include/block/blockjob.h | 2 +- include/hw/virtio/virtio-scsi.h | 11 ------- include/hw/virtio/virtio.h | 1 - tests/qemu-iotests/077 | 12 +------- tests/qemu-iotests/077.out | 26 ----------------- tests/test-coroutine.c | 10 ++++++- tests/test-throttle.c | 10 +++++++ trace-events | 1 - util/throttle.c | 8 ++++++ 15 files changed, 74 insertions(+), 248 deletions(-) -- 2.5.5