The following changes since commit d2966f804d70a244f5dde395fc5d22a50ed3e74e:
Merge remote-tracking branch 'remotes/vivier/tags/pull-m68k-20150629' into staging (2015-06-29 17:03:20 +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 764ba3ae511adddfa750db290ac8375d660ca5b9: block: remove redundant check before g_slist_find() (2015-07-02 10:06:23 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Alberto Garcia (3): timer: Move NANOSECONDS_PER_SECONDS to timer.h timer: Use a single definition of NSEC_PER_SEC for the whole codebase block: remove redundant check before g_slist_find() Fam Zheng (8): block: Add bdrv_get_block_status_above qmp: Add optional bool "unmap" to drive-mirror mirror: Do zero write on target if sectors not allocated block: Fix dirty bitmap in bdrv_co_discard block: Remove bdrv_reset_dirty qemu-iotests: Make block job methods common qemu-iotests: Add test case for mirror with unmap iotests: Use event_wait in wait_ready Jindřich Makovička (1): qcow2: Handle EAGAIN returned from update_refcount John Snow (1): qapi: Rename 'dirty-bitmap' mode to 'incremental' Paolo Bonzini (1): blockdev: no need to drain+flush in hmp_drive_del Peter Lieven (3): block/iscsi: add support for request timeouts block/iscsi: restore compatiblity with libiscsi 1.9.0 block/nfs: limit maximum readahead size to 1MB block.c | 12 ----- block/backup.c | 10 ++-- block/io.c | 62 +++++++++++++++++------ block/iscsi.c | 111 +++++++++++++++++++++++++++++++++--------- block/mirror.c | 32 +++++++++--- block/nfs.c | 7 +++ block/qcow2-refcount.c | 22 +++++---- blockdev.c | 8 +-- docs/bitmaps.md | 8 +-- hmp.c | 2 +- hw/ppc/ppc.c | 2 - hw/ppc/spapr_rtc.c | 3 +- hw/timer/mc146818rtc.c | 1 - hw/usb/hcd-ehci.c | 2 +- include/block/block.h | 4 ++ include/block/block_int.h | 6 +-- include/qemu/throttle.h | 2 - include/qemu/timer.h | 2 + qapi/block-core.json | 16 ++++-- qemu-options.hx | 5 ++ qmp-commands.hx | 9 ++-- tests/qemu-iotests/041 | 66 ++++++------------------- tests/qemu-iotests/124 | 6 +-- tests/qemu-iotests/132 | 59 ++++++++++++++++++++++ tests/qemu-iotests/132.out | 5 ++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 23 +++++++++ tests/rtl8139-test.c | 10 ++-- tests/test-throttle.c | 8 +-- tests/wdt_ib700-test.c | 15 +++--- util/throttle.c | 4 +- 31 files changed, 353 insertions(+), 170 deletions(-) create mode 100644 tests/qemu-iotests/132 create mode 100644 tests/qemu-iotests/132.out -- 2.4.3
