I'm sorry for having singlehandedly stalled the block pull request twice now, and I sure hope everything is going to be fine this time.
v9 was missing a change to patch 13: While it did (probably?) fix cocoa.m in patch 11 for patch 11, patch 13 changed the signature of the function in question yet again, so with the whole series applied, it still broke. Just as v9, this series consists of the changed patch (patch 13) only. The sole difference to v8/v9 is an added "false, 0," line in cocoa.m (clang tells me that putting plain integers into enums is fine in Obj-C (unlike in C++), so I hope it works). “Third time's the charm”, that's what they say. git-backport-diff against v9: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/15:[----] [--] 'block: Add blk_remove_bs()' 002/15:[----] [--] 'block: Make bdrv_states public' 003/15:[----] [--] 'block: Add functions for inheriting a BBRS' 004/15:[----] [--] 'blockdev: Add blockdev-open-tray' 005/15:[----] [--] 'blockdev: Add blockdev-close-tray' 006/15:[----] [--] 'blockdev: Add blockdev-remove-medium' 007/15:[----] [--] 'blockdev: Add blockdev-insert-medium' 008/15:[----] [--] 'blockdev: Implement eject with basic operations' 009/15:[----] [--] 'blockdev: Implement change with basic operations' 010/15:[----] [--] 'block: Inquire tray state before tray-moved events' 011/15:[----] [--] 'qmp: Introduce blockdev-change-medium' 012/15:[----] [--] 'hmp: Use blockdev-change-medium for change command' 013/15:[0001] [FC] 'blockdev: read-only-mode for blockdev-change-medium' 014/15:[----] [--] 'hmp: Add read-only-mode option to change command' 015/15:[----] [--] 'iotests: Add test for change-related QMP commands' Max Reitz (15): block: Add blk_remove_bs() block: Make bdrv_states public block: Add functions for inheriting a BBRS blockdev: Add blockdev-open-tray blockdev: Add blockdev-close-tray blockdev: Add blockdev-remove-medium blockdev: Add blockdev-insert-medium blockdev: Implement eject with basic operations blockdev: Implement change with basic operations block: Inquire tray state before tray-moved events qmp: Introduce blockdev-change-medium hmp: Use blockdev-change-medium for change command blockdev: read-only-mode for blockdev-change-medium hmp: Add read-only-mode option to change command iotests: Add test for change-related QMP commands block.c | 3 +- block/block-backend.c | 56 +++- blockdev.c | 286 ++++++++++++---- hmp-commands.hx | 20 +- hmp.c | 47 ++- include/block/block_int.h | 2 + include/sysemu/block-backend.h | 3 + include/sysemu/blockdev.h | 2 - qapi-schema.json | 6 +- qapi/block-core.json | 126 ++++++++ qmp-commands.hx | 218 +++++++++++++ qmp.c | 3 +- tests/qemu-iotests/118 | 720 +++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/118.out | 5 + tests/qemu-iotests/group | 1 + ui/cocoa.m | 11 +- 16 files changed, 1403 insertions(+), 106 deletions(-) create mode 100755 tests/qemu-iotests/118 create mode 100644 tests/qemu-iotests/118.out -- 2.6.2