v2: * Replaced g_assert_false(...) with g_assert(!...) [Peter] The following changes since commit 07e2863d0271ac6c05206d8ce9e4f4c39b25d3ea:
exec.c: fix setting 1-byte-long watchpoints (2014-09-19 17:42:16 +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 52b53c04faab9f7a9879c8dc014930649a3e698d: block: Always compile virtio-blk dataplane (2014-09-22 11:39:51 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Chrysostomos Nanakos (2): block/archipelago: Fix typo in qemu_archipelago_truncate() async: aio_context_new(): Handle event_notifier_init failure Fam Zheng (27): ide/ahci: Check for -ECANCELED in aio callbacks block: Add refcnt in BlockDriverAIOCB block: Add bdrv_aio_cancel_async block: Drop bdrv_em_co_aiocb_info.cancel block: Drop bdrv_em_aiocb_info.cancel thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async linux-aio: Convert laio_aiocb_info.cancel to .cancel_async dma: Convert dma_aiocb_info.cancel to .cancel_async iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async archipelago: Drop archipelago_aiocb_info.cancel blkdebug: Drop blkdebug_aiocb_info.cancel blkverify: Drop blkverify_aiocb_info.cancel curl: Drop curl_aiocb_info.cancel qed: Drop qed_aiocb_info.cancel quorum: Convert quorum_aiocb_info.cancel to .cancel_async rbd: Drop rbd_aiocb_info.cancel sheepdog: Convert sd_aiocb_info.cancel to .cancel_async win32-aio: Drop win32_aiocb_info.cancel ide: Convert trim_aiocb_info.cancel to .cancel_async block: Drop AIOCBInfo.cancel block: Rename qemu_aio_release -> qemu_aio_unref block: Introduce "null" drivers qapi: Sort BlockdevDriver enum data list qapi: Sort items in BlockdevOptions definition virtio: Import virtio_vring.h vring: Better error handling if num is too large block: Always compile virtio-blk dataplane Gonglei (2): qdev-monitor: fix segmentation fault on qdev_device_help() hmp: fix memory leak at hmp_info_block_jobs() Jeff Cody (1): block: vhdx - fix reading beyond pointer during image creation John Snow (9): ide/atapi: Mark non-data commands as complete ahci: Adding basic functionality qtest. ahci: MSI capability should be at 0x80, not 0x50. ahci: Add test_pci_spec to ahci-test. ahci: add test_pci_enable to ahci-test. ahci: properly shadow the TFD register ahci: Add test_hba_spec to ahci-test. ahci: Add test_hba_enable to ahci-test. ahci: Add test_identify case to ahci-test. Liu Yuan (1): quorum: fix quorum_aio_cancel() Maria Kustova (4): image-fuzzer: Trivial readability and formatting improvements docs: List all image elements currently supported by the fuzzer fuzz: Add fuzzing functions for entries of refcount table and blocks layout: Add generators for refcount table and blocks Max Reitz (9): qapi/block: Add "fatal" to BLOCK_IMAGE_CORRUPTED qcow2: Add qcow2_signal_corruption() qcow2: Use qcow2_signal_corruption() for overlaps qcow2: Check L1/L2/reftable entries for alignment iotests: Add more tests for qcow2 corruption qcow2: Fix leak of QemuOpts in qcow2_open() qapi: Allow enums in anonymous unions qcow2: Add overlap-check.template option qapi/block-core: Add "new" qcow2 options Paolo Bonzini (2): aio-win32: fix uninitialized use of have_select_revents aio-win32: avoid out-of-bounds access to the events array Peter Maydell (1): block/vhdx.c: Mark parent_vhdx_guid variable as unused Stefan Hajnoczi (1): block: delete cow block driver aio-win32.c | 8 +- async.c | 16 +- block.c | 72 +- block/Makefile.objs | 3 +- block/archipelago.c | 21 +- block/blkdebug.c | 17 +- block/blkverify.c | 21 +- block/cow.c | 433 ---------- block/curl.c | 16 +- block/iscsi.c | 23 +- block/linux-aio.c | 34 +- block/null.c | 168 ++++ block/qcow2-cluster.c | 43 +- block/qcow2-refcount.c | 67 +- block/qcow2.c | 77 +- block/qcow2.h | 6 + block/qed.c | 23 +- block/quorum.c | 11 +- block/rbd.c | 25 +- block/sheepdog.c | 54 +- block/vhdx.c | 19 +- block/win32-aio.c | 18 +- configure | 21 +- dma-helpers.c | 20 +- docs/image-fuzzer.txt | 3 +- hmp.c | 2 + hw/block/Makefile.objs | 2 +- hw/block/virtio-blk.c | 20 +- hw/ide/ahci.c | 45 +- hw/ide/atapi.c | 7 +- hw/ide/core.c | 26 +- hw/ide/ich.c | 7 +- hw/net/vhost_net.c | 2 +- hw/virtio/Makefile.objs | 2 +- hw/virtio/dataplane/vring.c | 3 +- include/block/aio.h | 9 +- include/block/block.h | 1 + include/hw/virtio/dataplane/vring.h | 2 +- include/hw/virtio/virtio-blk.h | 2 - include/hw/virtio/virtio_ring.h | 167 ++++ include/qemu/main-loop.h | 2 +- iothread.c | 11 +- linux-headers/linux/vhost.h | 2 +- main-loop.c | 9 +- qapi/block-core.json | 146 +++- qdev-monitor.c | 2 +- qemu-doc.texi | 9 - qemu-img.c | 8 +- qemu-img.texi | 4 +- qemu-io.c | 7 +- qemu-nbd.c | 6 +- qmp-commands.hx | 2 +- scripts/qapi-types.py | 2 + scripts/qapi-visit.py | 3 +- tests/Makefile | 2 + tests/ahci-test.c | 1561 +++++++++++++++++++++++++++++++++++ tests/image-fuzzer/qcow2/fuzz.py | 26 +- tests/image-fuzzer/qcow2/layout.py | 138 +++- tests/image-fuzzer/runner.py | 54 +- tests/libqos/pci.c | 6 + tests/qemu-iotests/060 | 56 +- tests/qemu-iotests/060.out | 61 +- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/072 | 2 +- tests/qemu-iotests/099 | 2 +- tests/qemu-iotests/common | 6 - tests/test-aio.c | 10 +- tests/test-thread-pool.c | 44 +- tests/test-throttle.c | 10 +- thread-pool.c | 36 +- ui/cocoa.m | 2 +- vl.c | 5 +- 72 files changed, 2806 insertions(+), 946 deletions(-) delete mode 100644 block/cow.c create mode 100644 block/null.c create mode 100644 include/hw/virtio/virtio_ring.h create mode 100644 tests/ahci-test.c -- 1.9.3
