The following changes since commit 7fb8da2b8861795e0013e6ee97acd0363d868a35:
Open 2.3 development tree (2014-12-09 21:48:34 +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 d899d2e248b900c53dd9081bde9f110e05747433: vmdk: Set errp on failures in vmdk_open_vmdk4 (2014-12-10 10:31:21 +0100) ---------------------------------------------------------------- Block patches for 2.3 ---------------------------------------------------------------- Anton Blanchard (1): nvme: 64kB page size fixes Fam Zheng (12): block: Add bdrv_next_node block: Add bdrv_get_node_name block: Include "node-name" if present in query-blockstats qmp: Add optional switch "query-nodes" in query-blockstats tests: Use "command -v" instead of which(1) in shell scripts qemu-iotests: Skip 099 for VMDK subformats with desc file vmdk: Use g_random_int to generate CID vmdk: Fix comment to match code of extent lines vmdk: Clean up descriptor file reading vmdk: Check descriptor file length when reading it vmdk: Remove unnecessary initialization vmdk: Set errp on failures in vmdk_open_vmdk4 Jeff Cody (2): block: remove BLOCK_OPT_NOCOW from vdi_create_opts block: remove BLOCK_OPT_NOCOW from vpc_create_opts Kevin Wolf (18): block/qapi: Add cache information to query-block block/hmp: Factor out print_block_info() block/hmp: Allow info = NULL in print_block_info() block/hmp: Allow node-name in 'info block' monitor: Fix HMP tab completion qemu-io: Allow explicitly specifying format qemu-iotests: Use qemu-io -f $IMGFMT qemu-iotests: Add qemu-io format option in Python tests qtests: Specify image format explicitly block: Read only one sector for format probing raw: Prohibit dangerous writes for probed images qemu-iotests: Fix stderr handling in common.qemu qemu-iotests: Test writing non-raw image headers to raw image qcow2: Fix header extension size check qcow2.py: Add required padding for header extensions block: Don't probe for unknown backing file format qemu-iotests: 060: Filter the real disk size ide: Check validity of logical block size Markus Armbruster (2): block: Factor bdrv_probe_all() out of find_image_format() block: Use g_new0() for a bit of extra type checking Max Reitz (26): qjson: Drop trailing space for pretty formatting chardev: Add -qmp-pretty iotests: _filter_qmp for pretty JSON output iotests: Use -qmp-pretty in 067 blkdebug: Simplify and improve filename generation iotests: Plain blkdebug filename generation block: Lift more functions into BlockBackend block: Add AioContextNotifier functions to BB block: Add blk_add_close_notifier() for BB nbd: Change external interface to BlockBackend nbd: Use BlockBackend internally qemu-nbd: Use BlockBackend where reasonable iotests: Specify qcow2 format for qemu-io in 059 block: Make essential BlockDriver objects public block: Omit bdrv_find_format for essential drivers block/vvfat: qcow driver may not be found block/nfs: Add create_opts block: Check create_opts before image creation qemu-img: Check create_opts before image creation qemu-img: Check create_opts before image amendment iotests: Only kill NBD server if it runs iotests: Add test for unsupported image creation qcow2: Prevent numerical overflow qcow2: Flushing the caches in qcow2_close may fail qcow2: Respect bdrv_truncate() error block/raw-posix: Fix ret in raw_open_common() Michael Mueller (1): qemu-iotests: 082: Filter the real disk size Paolo Bonzini (1): block: do not use get_clock() Stefan Hajnoczi (10): blockdev: acquire AioContext in blockdev-snapshot-delete-internal-sync blockdev: check for BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE blockdev: acquire AioContext in eject, change, and block_passwd blockdev: acquire AioContext in change-backing-file ahci: avoid #ifdef DEBUG_AHCI bitrot ahci: replace SATA FIS type magic numbers with constants blockdev: update outdated qmp_transaction() comments blockdev: drop unnecessary DriveBackupState field assignment blockdev: acquire AioContext in QMP 'transaction' actions blockdev: check for BLOCK_OP_TYPE_INTERNAL_SNAPSHOT aio-posix.c | 2 +- aio-win32.c | 4 +- async.c | 2 +- block.c | 100 ++- block/accounting.c | 6 +- block/blkdebug.c | 99 +-- block/block-backend.c | 38 + block/nfs.c | 15 + block/qapi.c | 32 +- block/qcow2-cluster.c | 2 +- block/qcow2.c | 33 +- block/raw-posix.c | 11 +- block/raw-win32.c | 2 +- block/raw_bsd.c | 66 +- block/vdi.c | 5 - block/vmdk.c | 29 +- block/vpc.c | 5 - block/vvfat.c | 6 + blockdev-nbd.c | 15 +- blockdev.c | 149 +++- hmp.c | 221 +++--- hw/block/dataplane/virtio-blk.c | 6 + hw/block/nvme.c | 1 + hw/block/nvme.h | 2 +- hw/ide/ahci.c | 24 +- hw/ide/ahci.h | 5 +- hw/ide/qdev.c | 5 + include/block/block.h | 2 + include/block/block_int.h | 13 + include/block/nbd.h | 7 +- include/sysemu/block-backend.h | 12 + monitor.c | 8 +- nbd.c | 63 +- qapi/block-core.json | 36 +- qemu-img.c | 21 + qemu-io.c | 28 +- qemu-nbd.c | 12 +- qemu-options.hx | 8 + qmp-commands.hx | 2 +- qobject/qjson.c | 10 +- tests/ahci-test.c | 3 +- tests/bios-tables-test.c | 2 +- tests/drive_del-test.c | 2 +- tests/fdc-test.c | 2 +- tests/hd-geo-test.c | 2 +- tests/i440fx-test.c | 5 +- tests/ide-test.c | 9 +- tests/nvme-test.c | 2 +- tests/qemu-iotests/016 | 11 +- tests/qemu-iotests/026.out | 120 ++++ tests/qemu-iotests/030 | 22 +- tests/qemu-iotests/040 | 32 +- tests/qemu-iotests/048 | 2 +- tests/qemu-iotests/051.out | 1 + tests/qemu-iotests/055 | 18 +- tests/qemu-iotests/058 | 11 +- tests/qemu-iotests/059 | 4 +- tests/qemu-iotests/060 | 2 +- tests/qemu-iotests/060.out | 5 +- tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/067.out | 804 ++++++++++++++++++++-- tests/qemu-iotests/071 | 10 +- tests/qemu-iotests/071.out | 14 +- tests/qemu-iotests/077 | 2 +- tests/qemu-iotests/080 | 2 + tests/qemu-iotests/080.out | 2 + tests/qemu-iotests/081 | 8 +- tests/qemu-iotests/081.out | 2 +- tests/qemu-iotests/082 | 14 +- tests/qemu-iotests/082.out | 49 +- tests/qemu-iotests/089 | 6 +- tests/qemu-iotests/089.out | 2 + tests/qemu-iotests/099 | 18 +- tests/qemu-iotests/099.out | 12 +- tests/qemu-iotests/109 | 132 ++++ tests/qemu-iotests/109.out | 231 +++++++ tests/qemu-iotests/113 | 76 ++ tests/qemu-iotests/113.out | 15 + tests/qemu-iotests/114 | 61 ++ tests/qemu-iotests/114.out | 13 + tests/qemu-iotests/common | 10 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 4 +- tests/qemu-iotests/common.qemu | 3 +- tests/qemu-iotests/common.rc | 15 +- tests/qemu-iotests/group | 3 + tests/qemu-iotests/qcow2.py | 4 + tests/qemu-iotests/sample_images/grub_mbr.raw.bz2 | Bin 0 -> 552 bytes tests/usb-hcd-uhci-test.c | 2 +- tests/usb-hcd-xhci-test.c | 2 +- tests/virtio-blk-test.c | 4 +- tests/virtio-scsi-test.c | 4 +- vl.c | 15 +- 93 files changed, 2357 insertions(+), 548 deletions(-) create mode 100755 tests/qemu-iotests/109 create mode 100644 tests/qemu-iotests/109.out create mode 100755 tests/qemu-iotests/113 create mode 100644 tests/qemu-iotests/113.out create mode 100755 tests/qemu-iotests/114 create mode 100644 tests/qemu-iotests/114.out create mode 100644 tests/qemu-iotests/sample_images/grub_mbr.raw.bz2