The following changes since commit 84cbd63f87c1d246f51ec8eee5367a5588f367fd:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2015-04-28 12:22:20 +0100) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 61007b316cd71ee7333ff7a0a749a8949527575f: block: move I/O request processing to block/io.c (2015-04-28 15:36:17 +0200) ---------------------------------------------------------------- Block patches ---------------------------------------------------------------- Alberto Garcia (5): MAINTAINERS: Add myself as the maintainer of the Quorum driver block: add bdrv_get_device_or_node_name() block: use bdrv_get_device_or_node_name() in error messages block: add 'node-name' field to BLOCK_IMAGE_CORRUPTED qmp: fill in the image field in BlockDeviceInfo Fam Zheng (10): block: Switch to host monotonic clock for IO throttling block/null: Latency simulation by adding new option "latency-ns" block/null: Support reopen MAINTAINERS: Add Fam Zheng as Null block driver maintainer blockjob: Allow nested pause block: Pause block jobs in bdrv_drain_all qemu-iotests: Test that "stop" doesn't drain block jobs blockjob: Update function name in comments qapi: Add optional field "name" to block dirty bitmap vmdk: Widen before shifting 32 bit header field John Snow (20): docs: incremental backup documentation qmp: Ensure consistent granularity type qmp: Add block-dirty-bitmap-add and block-dirty-bitmap-remove block: Introduce bdrv_dirty_bitmap_granularity() hbitmap: cache array lengths hbitmap: add hbitmap_merge block: Add bitmap disabled status block: Add bitmap successors qmp: Add support of "dirty-bitmap" sync mode for drive-backup qmp: add block-dirty-bitmap-clear qmp: Add dirty bitmap status field in query-block block: add BdrvDirtyBitmap documentation block: Ensure consistent bitmap function prototypes block: Resize bitmaps on bdrv_truncate hbitmap: truncate tests iotests: add invalid input incremental backup tests iotests: add QMP event waiting queue iotests: add simple incremental backup case iotests: add incremental backup failure recovery test iotests: add incremental backup granularity tests Kevin Wolf (5): block-backend: Expose bdrv_write_zeroes() qemu-img convert: Rewrite copying logic qemu-iotests: Some qemu-img convert tests blkdebug: Add bdrv_truncate() vhdx: Fix zero-fill iov length Max Reitz (1): block/mirror: Always call block_job_sleep_ns() Michael S. Tsirkin (1): virtio_blk: comment fix Michael Tokarev (1): block/dmg: make it modular Paolo Bonzini (6): omap_intc: convert ffs(3) to ctz32() in omap_inth_sir_update() aio-posix: move pollfds to thread-local storage AioContext: acquire/release AioContext during aio_poll iothread: release iothread around aio_poll block: avoid unnecessary bottom halves m25p80: add missing blk_attach_dev_nofail Peter Lieven (9): block/iscsi: do not forget to logout from target block/iscsi: change all iscsilun properties from uint8_t to bool block/iscsi: rename iscsi_write_protected and let it return void block/iscsi: store DPOFUA bit from the modesense command block/iscsi: optimize WRITE10/16 if cache.writeback is not set block/iscsi: increase retry count block/iscsi: handle SCSI_STATUS_TASK_SET_FULL block/iscsi: bump year in copyright notice block/iscsi: use the allocationmap also if cache.direct=on Stefan Hajnoczi (17): bt-sdp: fix broken uuids power-of-2 calculation hw/arm/nseries: convert ffs(3) to ctz32() uninorth: convert ffs(3) to ctz32() Convert (ffs(val) - 1) to ctz32(val) Convert ffs() != 0 callers to ctz32() sd: convert sd_normal_command() ffs(3) call to ctz32() os-win32: drop ffs(3) prototype checkpatch: complain about ffs(3) calls thread-pool: clean up thread_pool_completion_bh() scripts: add 'qemu coroutine' command to qemu-gdb.py m25p80: fix s->blk usage before assignment block: document block-stream in qmp-commands.hx Revert "hmp: fix crash in 'info block -n -v'" block: replace bdrv_states iteration with bdrv_next() block: add bdrv_set_dirty()/bdrv_reset_dirty() to block_int.h block: extract bdrv_setup_io_funcs() block: move I/O request processing to block/io.c Yi Wang (1): savevm: create snapshot failed when id_str already exists MAINTAINERS | 12 + aio-posix.c | 87 +- aio-win32.c | 8 + async.c | 10 +- block.c | 2854 +++------------------------ block/Makefile.objs | 5 +- block/backup.c | 155 +- block/blkdebug.c | 6 + block/block-backend.c | 11 + block/io.c | 2540 ++++++++++++++++++++++++ block/iscsi.c | 64 +- block/mirror.c | 53 +- block/null.c | 66 +- block/qapi.c | 46 +- block/qcow.c | 8 +- block/qcow2-refcount.c | 2 +- block/qcow2-snapshot.c | 6 +- block/qcow2.c | 14 +- block/qed.c | 6 +- block/quorum.c | 5 +- block/rbd.c | 2 +- block/sheepdog.c | 2 +- block/snapshot.c | 12 +- block/vdi.c | 6 +- block/vhdx.c | 10 +- block/vmdk.c | 10 +- block/vpc.c | 6 +- block/vvfat.c | 7 +- blockdev.c | 195 +- blockjob.c | 23 +- docs/bitmaps.md | 352 ++++ docs/qmp/qmp-events.txt | 21 +- hmp.c | 6 +- hw/acpi/pcihp.c | 2 +- hw/arm/nseries.c | 5 +- hw/arm/omap1.c | 6 +- hw/arm/pxa2xx_gpio.c | 2 +- hw/arm/strongarm.c | 4 +- hw/block/m25p80.c | 5 +- hw/bt/sdp.c | 2 +- hw/char/virtio-serial-bus.c | 8 +- hw/display/tc6393xb.c | 2 +- hw/gpio/max7310.c | 2 +- hw/gpio/omap_gpio.c | 13 +- hw/gpio/zaurus.c | 2 +- hw/i2c/omap_i2c.c | 10 +- hw/intc/allwinner-a10-pic.c | 8 +- hw/intc/omap_intc.c | 9 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/uninorth.c | 5 +- hw/pci/msi.c | 12 +- hw/pci/pcie_aer.c | 2 +- hw/pci/shpc.c | 10 +- hw/pci/slotid_cap.c | 2 +- hw/ppc/ppce500_spin.c | 2 +- hw/scsi/megasas.c | 2 +- hw/sd/sd.c | 3 +- include/block/aio.h | 16 +- include/block/block.h | 36 +- include/block/block_int.h | 16 +- include/block/blockjob.h | 22 +- include/block/qapi.h | 2 +- include/hw/pci/pci.h | 16 +- include/hw/pci/pcie_regs.h | 18 +- include/qapi/qmp/qerror.h | 6 - include/qemu/hbitmap.h | 23 + include/standard-headers/linux/virtio_blk.h | 8 +- include/sysemu/block-backend.h | 2 + include/sysemu/os-win32.h | 3 - iothread.c | 11 +- kvm-all.c | 8 +- migration/block.c | 9 +- qapi/block-core.json | 113 +- qemu-img.c | 516 +++-- qmp-commands.hx | 130 +- scripts/checkpatch.pl | 11 + scripts/qemu-gdb.py | 75 + scripts/qmp/qmp.py | 95 +- target-ppc/cpu.h | 4 +- tests/qemu-iotests/122 | 223 +++ tests/qemu-iotests/122.out | 209 ++ tests/qemu-iotests/124 | 363 ++++ tests/qemu-iotests/124.out | 5 + tests/qemu-iotests/129 | 86 + tests/qemu-iotests/129.out | 5 + tests/qemu-iotests/group | 3 + tests/qemu-iotests/iotests.py | 38 + tests/test-aio.c | 19 +- tests/test-hbitmap.c | 255 +++ thread-pool.c | 14 +- util/hbitmap.c | 85 + 91 files changed, 6033 insertions(+), 3142 deletions(-) create mode 100644 block/io.c create mode 100644 docs/bitmaps.md create mode 100755 tests/qemu-iotests/122 create mode 100644 tests/qemu-iotests/122.out create mode 100644 tests/qemu-iotests/124 create mode 100644 tests/qemu-iotests/124.out create mode 100644 tests/qemu-iotests/129 create mode 100644 tests/qemu-iotests/129.out