Peter Maydell 61ead113ae Pull request ... v2: * Resolved merge conflict with block/iscsi.c [Peter] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXj6TkAAoJEJykq7OBq3PI15oIAL24OFnMTFOAWyY2h3yfzGwe Gn1qzFOTHCXgbgVsolVuZnFU/SDn9WzMS9y6o7jcJykv++FdMSYUO7paPQAg9etX o9KOgyfUUDhskbaXEbTKxhqy7UvcyJsZYmjN+TD5tupfnrqGlmu6rkUPpSwGo++G u7CkAZewJc5SvsCdQRe3N10LbG4xU/j06cjCIHWDPRr+AV9qvsb9KkIOg3wkrhWN R83yj+yX6vhfQouHLoOlh3RYZ5HNo020JPum0jT1tGcoshKoFyu0prSRqNVVMqTY BepvWMhXbiq219HnFaQBtnysve9gWix4WhuCHtaAlaZDTBh945ZztsW7w7dubtA= =7ics -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Pull request v2: * Resolved merge conflict with block/iscsi.c [Peter] # gpg: Signature made Wed 20 Jul 2016 17:20:52 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: (25 commits) raw_bsd: Convert to byte-based interface nbd: Convert to byte-based interface block: Kill .bdrv_co_discard() sheepdog: Switch .bdrv_co_discard() to byte-based raw_bsd: Switch .bdrv_co_discard() to byte-based qcow2: Switch .bdrv_co_discard() to byte-based nbd: Switch .bdrv_co_discard() to byte-based iscsi: Switch .bdrv_co_discard() to byte-based gluster: Switch .bdrv_co_discard() to byte-based blkreplay: Switch .bdrv_co_discard() to byte-based block: Add .bdrv_co_pdiscard() driver callback block: Convert .bdrv_aio_discard() to byte-based rbd: Switch rbd_start_aio() to byte-based raw-posix: Switch paio_submit() to byte-based block: Convert BB interface to byte-based discards block: Convert bdrv_aio_discard() to byte-based block: Switch BlockRequest to byte-based block: Convert bdrv_discard() to byte-based block: Convert bdrv_co_discard() to byte-based iscsi: Rely on block layer to break up large requests ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Conflicts: block/gluster.c		2016-07-21 11:00:36 +01:00
..
accounting.h	Use scripts/clean-includes to drop redundant qemu/typedefs.h	2016-03-22 22:20:16 +01:00
aio.h	aio-posix: remove useless parameter	2016-07-18 15:10:52 +01:00
block_int.h	Pull request	2016-07-21 11:00:36 +01:00
block.h	block: Convert bdrv_aio_discard() to byte-based	2016-07-20 14:11:55 +01:00
blockjob.h	blockjob: Add 'job_id' parameter to block_job_create()	2016-07-13 13:26:02 +02:00
dirty-bitmap.h	dirty-bitmap: operate with int64_t amount	2016-07-19 16:54:46 -04:00
nbd.h	nbd: Convert to byte-based interface	2016-07-20 14:24:25 +01:00
qapi.h	block/qapi: Use blk_enable_write_cache()	2016-03-30 12:16:02 +02:00
raw-aio.h	linux-aio: share one LinuxAioState within an AioContext	2016-07-18 15:09:31 +01:00
scsi.h	* SCSI scanner support	2016-07-14 13:44:06 +01:00
snapshot.h	include: Clean up includes	2016-02-23 12:43:05 +00:00
thread-pool.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
throttle-groups.h	block: Move I/O throttling configuration functions to BlockBackend	2016-05-19 16:45:30 +02:00
write-threshold.h	Use scripts/clean-includes to drop redundant qemu/typedefs.h	2016-03-22 22:20:16 +01:00