The following changes since commit 3db34bf64ab4f8797565dd8750003156c32b301d:
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter'
into staging (2016-01-18 17:40:50 +0000)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to e9b155501da2638e4e319af9960d35da1bc8662b:
iotests: Test that throttle values ranges (2016-01-20 13:37:57 +0100)
----------------------------------------------------------------
Block layer patches
----------------------------------------------------------------
Christian Borntraeger (1):
block/raw-posix: avoid bogus fixup for cylinders on DASD disks
Eric Blake (1):
qemu-iotests: Reduce racy output in 028
Fam Zheng (4):
qemu-img: Speed up comparing empty/zero images
vmdk: Create streamOptimized as version 3
blockdev: Error out on negative throttling option values
iotests: Test that throttle values ranges
Kevin Wolf (10):
block: Fix .bdrv_open flags
qcow2: Write feature table only for v3 images
qcow2: Write full header on image creation
block: Assert no write requests under BDRV_O_INCOMING
block: Fix error path in bdrv_invalidate_cache()
block: Rename BDRV_O_INCOMING to BDRV_O_INACTIVE
block: Inactivate BDS when migration completes
qcow2: Implement .bdrv_inactivate
qcow2: Fix BDRV_O_INACTIVE handling in qcow2_invalidate_cache()
qcow2: Make image inaccessible after failed qcow2_invalidate_cache()
Peter Maydell (1):
block: Clean up includes
block.c | 55 ++++++++++++++++----
block/accounting.c | 1 +
block/archipelago.c | 2 +-
block/backup.c | 4 +-
block/blkdebug.c | 1 +
block/blkverify.c | 2 +-
block/block-backend.c | 1 +
block/bochs.c | 1 +
block/cloop.c | 1 +
block/commit.c | 1 +
block/curl.c | 1 +
block/dmg.c | 1 +
block/gluster.c | 1 +
block/io.c | 3 ++
block/iscsi.c | 2 +-
block/linux-aio.c | 1 +
block/mirror.c | 1 +
block/nbd-client.c | 1 +
block/nbd.c | 3 +-
block/nfs.c | 2 +-
block/null.c | 1 +
block/parallels.c | 1 +
block/qapi.c | 1 +
block/qcow.c | 1 +
block/qcow2-cache.c | 3 +-
block/qcow2-cluster.c | 1 +
block/qcow2-refcount.c | 1 +
block/qcow2-snapshot.c | 1 +
block/qcow2.c | 111 ++++++++++++++++++++++++----------------
block/qed-check.c | 1 +
block/qed-cluster.c | 1 +
block/qed-gencb.c | 1 +
block/qed-l2-cache.c | 1 +
block/qed-table.c | 1 +
block/qed.c | 5 +-
block/quorum.c | 1 +
block/raw-posix.c | 10 +---
block/raw-win32.c | 1 +
block/raw_bsd.c | 1 +
block/rbd.c | 2 +-
block/sheepdog.c | 1 +
block/snapshot.c | 1 +
block/ssh.c | 4 +-
block/stream.c | 1 +
block/throttle-groups.c | 1 +
block/vdi.c | 1 +
block/vhdx-endian.c | 1 +
block/vhdx-log.c | 1 +
block/vhdx.c | 1 +
block/vmdk.c | 9 +++-
block/vpc.c | 1 +
block/vvfat.c | 2 +-
block/win32-aio.c | 1 +
block/write-threshold.c | 1 +
blockdev.c | 3 +-
hw/block/block.c | 1 +
hw/block/cdrom.c | 1 +
hw/block/dataplane/virtio-blk.c | 1 +
hw/block/ecc.c | 1 +
hw/block/fdc.c | 1 +
hw/block/hd-geometry.c | 1 +
hw/block/m25p80.c | 1 +
hw/block/nvme.c | 1 +
hw/block/onenand.c | 1 +
hw/block/pflash_cfi01.c | 1 +
hw/block/pflash_cfi02.c | 1 +
hw/block/tc58128.c | 1 +
hw/block/virtio-blk.c | 1 +
hw/block/xen_disk.c | 12 +----
include/block/block.h | 3 +-
include/block/block_int.h | 1 +
include/qemu/throttle.h | 2 +
migration/migration.c | 7 +++
nbd/server.c | 2 +-
qemu-img.c | 47 +++++++++++------
qemu-io-cmds.c | 1 +
qemu-io.c | 5 +-
qmp.c | 12 +++++
tests/qemu-iotests/028 | 6 ++-
tests/qemu-iotests/028.out | 3 --
tests/qemu-iotests/031.out | 17 +++---
tests/qemu-iotests/036 | 2 +
tests/qemu-iotests/036.out | 5 ++
tests/qemu-iotests/051 | 18 +++++++
tests/qemu-iotests/051.out | 39 ++++++++++++++
tests/qemu-iotests/051.pc.out | 39 ++++++++++++++
tests/qemu-iotests/061.out | 35 +++++++------
util/throttle.c | 16 +++---
88 files changed, 390 insertions(+), 155 deletions(-)
