[Qemu-block] [PATCH 08/10] block: Accept device model name for blockdev-change-medium

[Kevin Wolf]

In order to remove the necessity to use BlockBackend names in the
external API, we want to allow qdev device names in all device related
commands.

This converts blockdev-change-medium to accept a qdev device name.

Signed-off-by: Kevin Wolf <address@hidden>
---
 blockdev.c           | 18 +++++++++++-------
 hmp.c                |  5 +++--
 qapi/block-core.json |  5 ++++-
 qmp-commands.hx      |  6 ++++--
 qmp.c                |  4 ++--
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 7bed3f6..6f81b07 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2536,7 +2536,9 @@ void qmp_x_blockdev_insert_medium(bool has_device, const 
char *device,
     qmp_blockdev_insert_anon_medium(blk, bs, errp);
 }
 
-void qmp_blockdev_change_medium(const char *device, const char *filename,
+void qmp_blockdev_change_medium(bool has_device, const char *device,
+                                bool has_id, const char *id,
+                                const char *filename,
                                 bool has_format, const char *format,
                                 bool has_read_only,
                                 BlockdevChangeReadOnlyMode read_only,
@@ -2549,10 +2551,10 @@ void qmp_blockdev_change_medium(const char *device, 
const char *filename,
     QDict *options = NULL;
     Error *err = NULL;
 
-    blk = blk_by_name(device);
+    blk = qmp_get_blk(has_device ? device : NULL,
+                      has_id ? id : NULL,
+                      errp);
     if (!blk) {
-        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-                  "Device '%s' not found", device);
         goto fail;
     }
 
@@ -2600,7 +2602,9 @@ void qmp_blockdev_change_medium(const char *device, const 
char *filename,
         goto fail;
     }
 
-    rc = do_open_tray(device, NULL, false, &err);
+    rc = do_open_tray(has_device ? device : NULL,
+                      has_id ? id : NULL,
+                      false, &err);
     if (rc && rc != -ENOSYS) {
         error_propagate(errp, err);
         goto fail;
@@ -2608,7 +2612,7 @@ void qmp_blockdev_change_medium(const char *device, const 
char *filename,
     error_free(err);
     err = NULL;
 
-    qmp_x_blockdev_remove_medium(true, device, false, NULL, errp);
+    qmp_x_blockdev_remove_medium(has_device, device, has_id, id, errp);
     if (err) {
         error_propagate(errp, err);
         goto fail;
@@ -2622,7 +2626,7 @@ void qmp_blockdev_change_medium(const char *device, const 
char *filename,
 
     blk_apply_root_state(blk, medium_bs);
 
-    qmp_blockdev_close_tray(true, device, false, NULL, errp);
+    qmp_blockdev_close_tray(has_device, device, has_id, id, errp);
 
 fail:
     /* If the medium has been inserted, the device has its own reference, so
diff --git a/hmp.c b/hmp.c
index fbd451a..dbe426a 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1422,8 +1422,9 @@ void hmp_change(Monitor *mon, const QDict *qdict)
             }
         }
 
-        qmp_blockdev_change_medium(device, target, !!arg, arg,
-                                   !!read_only, read_only_mode, &err);
+        qmp_blockdev_change_medium(true, device, false, NULL, target,
+                                   !!arg, arg, !!read_only, read_only_mode,
+                                   &err);
         if (err &&
             error_get_class(err) == ERROR_CLASS_DEVICE_ENCRYPTED) {
             error_free(err);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index c3177f4..9a19a50 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2425,6 +2425,8 @@
 #
 # @device:          block device name
 #
+# @id:              the name or QOM path of the guest device (since: 2.8)
+#
 # @filename:        filename of the new image to be loaded
 #
 # @format:          #optional, format to open the new image with (defaults to
@@ -2436,7 +2438,8 @@
 # Since: 2.5
 ##
 { 'command': 'blockdev-change-medium',
-  'data': { 'device': 'str',
+  'data': { '*device': 'str',
+            '*id': 'str',
             'filename': 'str',
             '*format': 'str',
             '*read-only-mode': 'BlockdevChangeReadOnlyMode' } }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 8822fd5..b11e4e4 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4573,7 +4573,7 @@ EQMP
 
     {
         .name       = "blockdev-change-medium",
-        .args_type  = "device:B,filename:F,format:s?,read-only-mode:s?",
+        .args_type  = "device:B?,id:s?,filename:F,format:s?,read-only-mode:s?",
         .mhandler.cmd_new = qmp_marshal_blockdev_change_medium,
     },
 
@@ -4586,7 +4586,9 @@ and loading a new image file which is inserted as the new 
medium.
 
 Arguments:
 
-- "device": device name (json-string)
+- "device": block device name (deprecated, use @id instead)
+            (json-string, optional)
+- "id": the name or QOM path of the guest device (json-string, optional)
 - "filename": filename of the new image (json-string)
 - "format": format of the new image (json-string, optional)
 - "read-only-mode": new read-only mode (json-string, optional)
diff --git a/qmp.c b/qmp.c
index b6d531e..f8be3e4 100644
--- a/qmp.c
+++ b/qmp.c
@@ -446,8 +446,8 @@ void qmp_change(const char *device, const char *target,
     if (strcmp(device, "vnc") == 0) {
         qmp_change_vnc(target, has_arg, arg, errp);
     } else {
-        qmp_blockdev_change_medium(device, target, has_arg, arg, false, 0,
-                                   errp);
+        qmp_blockdev_change_medium(true, device, false, NULL, target,
+                                   has_arg, arg, false, 0, errp);
     }
 }
 
-- 
1.8.3.1