The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7:
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to b9c649470ba0d4056b2d486105a0f8fb982654ae: block: Keep bdrv_check*_request()'s return value (2015-02-16 15:07:19 +0000) ---------------------------------------------------------------- Pull request v2: * Fix C11 typedef redefinitions in ahci and libqos malloc [Peter] * Fix lx -> PRIx64 format specifiers in ahci [Peter] ---------------------------------------------------------------- Bin Wu (1): nbd: fix the co_queue multi-adding bug Cornelia Huck (1): dataplane: endianness-aware accesses Fam Zheng (6): qtest: Fix deadloop by running main loop AIO context's timers qemu-io: Account IO by aio_read and aio_write qtest: Add scripts/qtest.py qemu-iotests: Add VM method qtest() to iotests.py qemu-iotests: Allow caller to disable underscore convertion for qmp qemu-iotests: Add 093 for IO throttling Jeff Cody (1): block: vmdk - fixed sizeof() error John Snow (34): libqos: Split apart pc_alloc_init qtest/ahci: Create ahci.h libqos: create libqos.c libqos: add qtest_vboot libqos: add alloc_init_flags libqos: Update QGuestAllocator to be opaque libqos: add pc specific interface qtest/ahci: Store hba_base in AHCIQState qtest/ahci: finalize AHCIQState consolidation qtest/ahci: remove pcibus global qtest/ahci: remove guest_malloc global libqos/ahci: Functional register helpers qtest/ahci: remove getter/setter macros qtest/ahci: Bookmark FB and CLB pointers libqos/ahci: create libqos/ahci.c libqos/ahci: Add ahci_port_select helper libqos/ahci: Add ahci_port_clear helper qtest/ahci: rename 'Command' to 'CommandHeader' libqos/ahci: Add command header helpers libqos/ahci: Add ahci_port_check_error helper libqos/ahci: Add ahci_port_check_interrupts helper libqos/ahci: Add port_check_nonbusy helper libqos/ahci: Add cmd response sanity check helpers qtest/ahci: Demagic ahci tests. qtest/ahci: add ahci_write_fis libqos/ahci: Add ide cmd properties libqos/ahci: add ahci command functions libqos/ahci: add ahci command verify libqos/ahci: add ahci command size setters libqos/ahci: Add ahci_guest_io libqos/ahci: add ahci_io libqos/ahci: Add ahci_clean_mem qtest/ahci: Assert sector size in identify test qtest/ahci: Adding simple dma read-write test Kevin Wolf (1): savevm: Improve error message for blocked migration Max Reitz (21): nbd: Drop BDS backpointer iotests: Add "wait" functionality to _cleanup_qemu iotests: Add test for drive-mirror with NBD target qemu-img: Fix qemu-img convert -n iotests: Add test for qemu-img convert to NBD block: Lift some BDS functions to the BlockBackend block: Add blk_new_open() block: Add Error parameter to bdrv_find_protocol() iotests: Add test for driver=qcow2, format=qcow2 blockdev: Use blk_new_open() in blockdev_init() block/xen: Use blk_new_open() in blk_connect() qemu-img: Use blk_new_open() in img_open() qemu-img: Use blk_new_open() in img_rebase() qemu-img: Use BlockBackend as far as possible qemu-nbd: Use blk_new_open() in main() qemu-io: Use blk_new_open() in openfile() qemu-io: Remove "growable" option qemu-io: Use BlockBackend block: Clamp BlockBackend requests block: Remove "growable" from BDS block: Keep bdrv_check*_request()'s return value block.c | 73 +- block/block-backend.c | 224 ++++++ block/nbd-client.c | 126 +-- block/nbd-client.h | 34 +- block/nbd.c | 37 +- block/qcow2.c | 6 - block/raw-posix.c | 2 +- block/raw-win32.c | 2 +- block/sheepdog.c | 4 +- block/vmdk.c | 3 +- blockdev.c | 92 +-- cpus.c | 4 + hmp.c | 9 +- hw/block/dataplane/virtio-blk.c | 4 +- hw/block/xen_disk.c | 27 +- hw/scsi/virtio-scsi-dataplane.c | 2 +- hw/virtio/Makefile.objs | 2 +- hw/virtio/dataplane/Makefile.objs | 2 +- hw/virtio/dataplane/vring.c | 53 +- include/block/block.h | 3 +- include/block/block_int.h | 3 - include/block/nbd.h | 1 - include/hw/virtio/dataplane/vring-accessors.h | 75 ++ include/hw/virtio/dataplane/vring.h | 14 +- include/qemu-io.h | 4 +- include/sysemu/block-backend.h | 13 + nbd.c | 8 +- qemu-img.c | 208 +++-- qemu-io-cmds.c | 250 +++--- qemu-io.c | 58 +- qemu-nbd.c | 25 +- savevm.c | 11 +- scripts/qtest.py | 71 ++ tests/Makefile | 5 +- tests/ahci-test.c | 1072 +++++-------------------- tests/libqos/ahci.c | 838 +++++++++++++++++++ tests/libqos/ahci.h | 549 +++++++++++++ tests/libqos/libqos-pc.c | 24 + tests/libqos/libqos-pc.h | 9 + tests/libqos/libqos.c | 63 ++ tests/libqos/libqos.h | 33 + tests/libqos/malloc-pc.c | 20 +- tests/libqos/malloc.c | 91 ++- tests/libqos/malloc.h | 26 +- tests/qemu-iotests/016 | 73 -- tests/qemu-iotests/016.out | 23 - tests/qemu-iotests/051 | 1 + tests/qemu-iotests/051.out | 63 +- tests/qemu-iotests/087.out | 8 +- tests/qemu-iotests/093 | 114 +++ tests/qemu-iotests/093.out | 5 + tests/qemu-iotests/094 | 81 ++ tests/qemu-iotests/094.out | 11 + tests/qemu-iotests/123 | 62 ++ tests/qemu-iotests/123.out | 9 + tests/qemu-iotests/common.qemu | 12 +- tests/qemu-iotests/group | 5 +- tests/qemu-iotests/iotests.py | 23 +- 58 files changed, 3076 insertions(+), 1594 deletions(-) create mode 100644 include/hw/virtio/dataplane/vring-accessors.h create mode 100644 scripts/qtest.py create mode 100644 tests/libqos/ahci.c create mode 100644 tests/libqos/ahci.h create mode 100644 tests/libqos/libqos-pc.c create mode 100644 tests/libqos/libqos-pc.h create mode 100644 tests/libqos/libqos.c create mode 100644 tests/libqos/libqos.h delete mode 100755 tests/qemu-iotests/016 delete mode 100644 tests/qemu-iotests/016.out create mode 100755 tests/qemu-iotests/093 create mode 100644 tests/qemu-iotests/093.out create mode 100755 tests/qemu-iotests/094 create mode 100644 tests/qemu-iotests/094.out create mode 100755 tests/qemu-iotests/123 create mode 100644 tests/qemu-iotests/123.out -- 2.1.0