diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-23 16:15:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-23 16:15:33 +0100 |
| commit | 3b71ec8516bb50e9a743645bf139571de0b39f61 (patch) | |
| tree | 95504b00e2940f8b23d33618b3afa9aa2ca99f5d /ui | |
| parent | eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5 (diff) | |
| parent | 9ec8873e684c2dae6fadb3a801057c613ccd2a6b (diff) | |
| download | qemu-3b71ec8516bb50e9a743645bf139571de0b39f61.tar.gz qemu-3b71ec8516bb50e9a743645bf139571de0b39f61.tar.bz2 qemu-3b71ec8516bb50e9a743645bf139571de0b39f61.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Fri 23 Sep 2016 12:59:46 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream: (33 commits)
block: Remove BB interface from blockdev-add/del
qemu-iotests/141: Avoid blockdev-add with id
block: Avoid printing NULL string in error messages
qemu-iotests/139: Avoid blockdev-add with id
qemu-iotests/124: Avoid blockdev-add with id
qemu-iotests/118: Avoid blockdev-add with id
qemu-iotests/117: Avoid blockdev-add with id
qemu-iotests/087: Avoid blockdev-add with id
qemu-iotests/081: Avoid blockdev-add with id
qemu-iotests/071: Avoid blockdev-add with id
qemu-iotests/067: Avoid blockdev-add with id
qemu-iotests/041: Avoid blockdev-add with id
qemu-iotests/118: Test media change with qdev name
block: Accept device model name for block_set_io_throttle
block: Accept device model name for blockdev-change-medium
block: Accept device model name for eject
block: Accept device model name for x-blockdev-remove-medium
block: Accept device model name for x-blockdev-insert-medium
block: Accept device model name for blockdev-open/close-tray
qdev-monitor: Add blk_by_qdev_id()
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/cocoa.m | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m index 52d9c54b6d..ba0e98a297 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1085,7 +1085,8 @@ QemuCocoaView *cocoaView; } Error *err = NULL; - qmp_eject([drive cStringUsingEncoding: NSASCIIStringEncoding], false, false, &err); + qmp_eject(true, [drive cStringUsingEncoding: NSASCIIStringEncoding], + false, NULL, false, false, &err); handleAnyDeviceErrors(err); } @@ -1118,8 +1119,10 @@ QemuCocoaView *cocoaView; } Error *err = NULL; - qmp_blockdev_change_medium([drive cStringUsingEncoding: + qmp_blockdev_change_medium(true, + [drive cStringUsingEncoding: NSASCIIStringEncoding], + false, NULL, [file cStringUsingEncoding: NSASCIIStringEncoding], true, "raw", |