diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-02 10:44:34 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-02 10:44:34 +0100 |
| commit | 6686ce3f1628f045035d58db8890d20705fd5c34 (patch) | |
| tree | acbc34609f422f0f2bb0f9cb39ad8d4c8c39bf96 /hw/input | |
| parent | d2966f804d70a244f5dde395fc5d22a50ed3e74e (diff) | |
| parent | 764ba3ae511adddfa750db290ac8375d660ca5b9 (diff) | |
| download | qemu-6686ce3f1628f045035d58db8890d20705fd5c34.zip qemu-6686ce3f1628f045035d58db8890d20705fd5c34.tar.gz qemu-6686ce3f1628f045035d58db8890d20705fd5c34.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu Jul 2 10:10:39 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
block: remove redundant check before g_slist_find()
block/nfs: limit maximum readahead size to 1MB
block/iscsi: restore compatiblity with libiscsi 1.9.0
iotests: Use event_wait in wait_ready
qemu-iotests: Add test case for mirror with unmap
qemu-iotests: Make block job methods common
block: Remove bdrv_reset_dirty
block: Fix dirty bitmap in bdrv_co_discard
mirror: Do zero write on target if sectors not allocated
qmp: Add optional bool "unmap" to drive-mirror
block: Add bdrv_get_block_status_above
timer: Use a single definition of NSEC_PER_SEC for the whole codebase
timer: Move NANOSECONDS_PER_SECONDS to timer.h
blockdev: no need to drain+flush in hmp_drive_del
qapi: Rename 'dirty-bitmap' mode to 'incremental'
qcow2: Handle EAGAIN returned from update_refcount
block/iscsi: add support for request timeouts
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/input')
0 files changed, 0 insertions, 0 deletions