The following changes since commit 338404d061144956b76f9893ca3434d057dff2d4:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160719' into staging (2016-07-20 12:48:18 +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 decaeed7734bddc95e2c81858fbbec3e923310a1: raw_bsd: Convert to byte-based interface (2016-07-20 14:24:25 +0100) ---------------------------------------------------------------- Pull request v2: * Resolved merge conflict with block/iscsi.c [Peter] ---------------------------------------------------------------- Eric Blake (25): block: Fragment reads to max transfer length raw_bsd: Don't advertise flags not supported by protocol layer block: Fragment writes to max transfer length nbd: Rely on block layer to break up large requests nbd: Drop unused offset parameter iscsi: Rely on block layer to break up large requests block: Convert bdrv_co_discard() to byte-based block: Convert bdrv_discard() to byte-based block: Switch BlockRequest to byte-based block: Convert bdrv_aio_discard() to byte-based block: Convert BB interface to byte-based discards raw-posix: Switch paio_submit() to byte-based rbd: Switch rbd_start_aio() to byte-based block: Convert .bdrv_aio_discard() to byte-based block: Add .bdrv_co_pdiscard() driver callback blkreplay: Switch .bdrv_co_discard() to byte-based gluster: Switch .bdrv_co_discard() to byte-based iscsi: Switch .bdrv_co_discard() to byte-based nbd: Switch .bdrv_co_discard() to byte-based qcow2: Switch .bdrv_co_discard() to byte-based raw_bsd: Switch .bdrv_co_discard() to byte-based sheepdog: Switch .bdrv_co_discard() to byte-based block: Kill .bdrv_co_discard() nbd: Convert to byte-based interface raw_bsd: Convert to byte-based interface block/blkreplay.c | 8 +- block/block-backend.c | 22 ++-- block/gluster.c | 14 +-- block/io.c | 246 ++++++++++++++++++++++++----------------- block/iscsi.c | 32 ++---- block/mirror.c | 5 +- block/nbd-client.c | 107 +++++++----------- block/nbd-client.h | 11 +- block/nbd.c | 30 ++--- block/qcow2-refcount.c | 4 +- block/qcow2.c | 10 +- block/raw-posix.c | 24 ++-- block/raw-win32.c | 19 ++-- block/raw_bsd.c | 59 +++++----- block/rbd.c | 29 +++-- block/sheepdog.c | 17 +-- block/trace-events | 4 +- hw/block/xen_disk.c | 7 +- hw/ide/core.c | 6 +- hw/scsi/scsi-disk.c | 8 +- include/block/block.h | 10 +- include/block/block_int.h | 8 +- include/block/nbd.h | 2 - include/sysemu/block-backend.h | 9 +- nbd/common.c | 5 +- nbd/nbd-internal.h | 4 +- nbd/server.c | 19 +--- qemu-io-cmds.c | 3 +- 28 files changed, 355 insertions(+), 367 deletions(-) -- 2.7.4
