Patch 11 of the last series broke the OS X build due to ui/cocoa.m directly referencing qmp_change_blockdev() (which was an internal function not directly mapped to any QMP command before, now it becomes an "external" function and is renamed qmp_blockdev_change_medium()). This v9 consists only of that patch, because the rest is completely unchanged from v8.
Unfortunately, neither am I rich enough nor do I have the immediate intention of buying Apple hardware any time soon anyway, so I have no way of verifying that this changed version builds on OS X. I would appreciate help with that. Oh, and if anybody ever asks me again why it might be a bad idea to put management code into the GUI layer of one specific operating system... git-backport-diff against v8: 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:[0010] [FC] 'qmp: Introduce blockdev-change-medium' 012/15:[----] [--] 'hmp: Use blockdev-change-medium for change command' 013/15:[----] [--] '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 | 10 +- 16 files changed, 1402 insertions(+), 106 deletions(-) create mode 100755 tests/qemu-iotests/118 create mode 100644 tests/qemu-iotests/118.out -- 2.6.2