The following changes since commit 39c153b80f890dc5f02465dc59992e195abd5f40:
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (2013-10-10 13:16:25 -0700) are available in the git repository at: git://repo.or.cz/qemu/kevin.git for-anthony for you to fetch changes up to 34eeb82de65ce9f83081a3357b0afe80a6a1d86a: qemu-iotests: Add test for inactive L2 overlap (2013-10-11 16:50:02 +0200) ---------------------------------------------------------------- BenoƮt Canet (1): block: Add BlockDriver.bdrv_check_ext_snapshot. Fam Zheng (7): blockjob: rename BlockJobType to BlockJobDriver qapi: Introduce enum BlockJobType qapi: make use of new BlockJobType qemu-iotests: move blank lines of output in case 059 vmdk: convert error code to use errp vmdk: refuse enabling zeroed grain with flat images vmdk: Fix vmdk_parse_extents Jeff Cody (1): block: qemu-iotests for vhdx, read sample dynamic image Kevin Wolf (18): block: Improve driver whitelist checks qapi-types/visit.py: Pass whole expr dict for structs qapi-types/visit.py: Inheritance for structs blockdev: Introduce DriveInfo.enable_auto_del blockdev: 'blockdev-add' QMP command blockdev: Separate ID generation from DriveInfo creation blockdev: Pass QDict to blockdev_init() blockdev: Move parsing of 'media' option to drive_init blockdev: Move parsing of 'if' option to drive_init blockdev: Moving parsing of geometry options to drive_init blockdev: Move parsing of 'boot' option to drive_init blockdev: Move bus/unit/index processing to drive_init blockdev: Move virtio-blk device creation to drive_init blockdev: Remove IF_* check for read-only blockdev_init qemu-iotests: Check autodel behaviour for device_del blockdev: Remove 'media' parameter from blockdev_init() blockdev: Don't disable COR automatically with blockdev-add blockdev: blockdev_init() error conversion Max Reitz (30): qapi: Add ImageInfoSpecific type block: Add bdrv_get_specific_info block/qapi: Human-readable ImageInfoSpecific dump qcow2: Add support for ImageInfoSpecific qemu-iotests: Discard specific info in _img_info qemu-iotests: Additional info from qemu-img info qcow2: Alignment of snapshot table entries qcow2: Use pread for inactive L1 in overlap check qcow2: Free preallocated zero clusters qcow2: Always use error path on writing snapshots qcow2: Free allocated snapshot table on error qcow2: Assert against snapshot name/ID overflow qemu-iotests: Discard preallocated zero clusters qcow2: Add missing space in error message qcow2: Remove wrong metadata overlap check qcow2: Fix snapshot restoration in snapshot_create qcow2: Use better type for numerical snapshot ID qcow2: Use negated overflow check mask qcow2: Make overlap check mask variable qcow2: Add overlap-check options qcow2: Array assigning options to OL check bits qcow2: Add more overlap check bitmask macros qcow2: Evaluate overlap check options block/raw_bsd: Employ error parameter block/raw-win32: Employ error parameter blkdebug: Employ error parameter blkverify: Employ error parameter block/raw-posix: Employ error parameter qemu-io: Let "open" pass options to block driver qemu-iotests: Add test for inactive L2 overlap Michael S. Tsirkin (1): ahci: set ahci mode on reset Peter Lieven (1): block/get_block_status: avoid redundant callouts on raw devices Wenchao Xia (2): tests: build the helper program by default build: add command check-clean Makefile | 1 - block.c | 53 +- block/backup.c | 6 +- block/blkdebug.c | 8 +- block/blkverify.c | 13 +- block/commit.c | 6 +- block/mirror.c | 6 +- block/qapi.c | 124 ++++ block/qcow2-cache.c | 8 +- block/qcow2-cluster.c | 16 +- block/qcow2-refcount.c | 37 +- block/qcow2-snapshot.c | 30 +- block/qcow2.c | 129 +++- block/qcow2.h | 30 +- block/raw-posix.c | 72 ++- block/raw-win32.c | 16 +- block/raw_bsd.c | 7 +- block/stream.c | 6 +- block/vmdk.c | 127 ++-- blockdev.c | 677 ++++++++++++--------- blockjob.c | 22 +- docs/qapi-code-gen.txt | 17 + docs/specs/qcow2.txt | 3 + hw/block/m25p80.c | 5 + hw/block/xen_disk.c | 5 + hw/ide/ahci.c | 10 +- hw/sd/milkymist-memcard.c | 4 + hw/sd/omap_mmc.c | 6 + hw/sd/pl181.c | 4 + hw/sd/pxa2xx_mmci.c | 3 + hw/sd/sd.c | 5 + hw/sd/sdhci.c | 3 + hw/sd/ssi-sd.c | 3 + include/block/block.h | 19 + include/block/block_int.h | 7 + include/block/blockjob.h | 14 +- include/block/qapi.h | 2 + include/qemu/option.h | 1 + include/sysemu/blockdev.h | 1 + qapi-schema.json | 288 ++++++++- qemu-io-cmds.c | 9 + qemu-io.c | 39 +- qmp-commands.hx | 55 ++ scripts/qapi-types.py | 15 +- scripts/qapi-visit.py | 26 +- tests/Makefile | 16 +- tests/qemu-iotests/051.out | 7 +- tests/qemu-iotests/059 | 12 +- tests/qemu-iotests/059.out | 18 +- tests/qemu-iotests/060 | 47 +- tests/qemu-iotests/060.out | 40 +- tests/qemu-iotests/064 | 62 ++ tests/qemu-iotests/064.out | 14 + tests/qemu-iotests/065 | 125 ++++ tests/qemu-iotests/065.out | 5 + tests/qemu-iotests/066 | 63 ++ tests/qemu-iotests/066.out | 13 + tests/qemu-iotests/067 | 133 ++++ tests/qemu-iotests/067.out | 80 +++ tests/qemu-iotests/common | 8 + tests/qemu-iotests/common.filter | 8 + tests/qemu-iotests/common.rc | 22 +- tests/qemu-iotests/group | 4 + tests/qemu-iotests/iotests.py | 4 + .../sample_images/iotest-dynamic-1G.vhdx.bz2 | Bin 0 -> 874 bytes util/qemu-option.c | 6 + 66 files changed, 2109 insertions(+), 516 deletions(-) create mode 100755 tests/qemu-iotests/064 create mode 100644 tests/qemu-iotests/064.out create mode 100755 tests/qemu-iotests/065 create mode 100644 tests/qemu-iotests/065.out create mode 100755 tests/qemu-iotests/066 create mode 100644 tests/qemu-iotests/066.out create mode 100755 tests/qemu-iotests/067 create mode 100644 tests/qemu-iotests/067.out create mode 100644 tests/qemu-iotests/sample_images/iotest-dynamic-1G.vhdx.bz2