From: Max Reitz <mreitz@redhat.com>
Date: Mon, 26 Oct 2015 20:39:12 +0000 (+0100)
Subject: blockdev: Implement eject with basic operations
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~121^2~1^2~76^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38f54bd1ee0ed0f13b7326eb79403e320c3a28d3;p=sdk%2Femulator%2Fqemu.git

blockdev: Implement eject with basic operations

Implement 'eject' by calling blockdev-open-tray and
blockdev-remove-medium.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/blockdev.c b/blockdev.c
index 0f2a7e2988..1624297296 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1980,16 +1980,15 @@ out:
 
 void qmp_eject(const char *device, bool has_force, bool force, Error **errp)
 {
-    BlockBackend *blk;
+    Error *local_err = NULL;
 
-    blk = blk_by_name(device);
-    if (!blk) {
-        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-                  "Device '%s' not found", device);
+    qmp_blockdev_open_tray(device, has_force, force, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
         return;
     }
 
-    eject_device(blk, force, errp);
+    qmp_blockdev_remove_medium(device, errp);
 }
 
 void qmp_block_passwd(bool has_device, const char *device,