diff options
| -rw-r--r-- | blockdev.c | 20 | ||||
| -rw-r--r-- | blockdev.h | 1 | ||||
| -rw-r--r-- | hmp-commands.hx | 3 | ||||
| -rw-r--r-- | hmp.c | 10 | ||||
| -rw-r--r-- | hmp.h | 1 | ||||
| -rw-r--r-- | qapi-schema.json | 21 | ||||
| -rw-r--r-- | qmp-commands.hx | 5 |
7 files changed, 39 insertions, 22 deletions
diff --git a/blockdev.c b/blockdev.c index 9ee5bae6cd..124fbe6c1b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -683,27 +683,17 @@ static void eject_device(BlockDriverState *bs, int force, Error **errp) bdrv_close(bs); } -int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) +void qmp_eject(const char *device, bool has_force, bool force, Error **errp) { BlockDriverState *bs; - int force = qdict_get_try_bool(qdict, "force", 0); - const char *filename = qdict_get_str(qdict, "device"); - Error *err = NULL; - bs = bdrv_find(filename); + bs = bdrv_find(device); if (!bs) { - qerror_report(QERR_DEVICE_NOT_FOUND, filename); - return -1; - } - - eject_device(bs, force, &err); - if (error_is_set(&err)) { - qerror_report_err(err); - error_free(err); - return -1; + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; } - return 0; + eject_device(bs, force, errp); } void qmp_block_passwd(const char *device, const char *password, Error **errp) diff --git a/blockdev.h b/blockdev.h index f1b639660d..1937b281c9 100644 --- a/blockdev.h +++ b/blockdev.h @@ -58,7 +58,6 @@ DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi); DriveInfo *add_init_drive(const char *opts); void do_commit(Monitor *mon, const QDict *qdict); -int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_change_block(Monitor *mon, const char *device, const char *filename, const char *fmt); int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); diff --git a/hmp-commands.hx b/hmp-commands.hx index 047fba2eeb..364623c1bd 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -75,8 +75,7 @@ ETEXI .args_type = "force:-f,device:B", .params = "[-f] device", .help = "eject a removable medium (use -f to force it)", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_eject, + .mhandler.cmd = hmp_eject, }, STEXI @@ -702,3 +702,13 @@ void hmp_expire_password(Monitor *mon, const QDict *qdict) qmp_expire_password(protocol, whenstr, &err); hmp_handle_error(mon, &err); } + +void hmp_eject(Monitor *mon, const QDict *qdict) +{ + int force = qdict_get_try_bool(qdict, "force", 0); + const char *device = qdict_get_str(qdict, "device"); + Error *err = NULL; + + qmp_eject(device, true, force, &err); + hmp_handle_error(mon, &err); +} @@ -51,5 +51,6 @@ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict); void hmp_set_password(Monitor *mon, const QDict *qdict); void hmp_expire_password(Monitor *mon, const QDict *qdict); +void hmp_eject(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index dc92a791e2..42682eb2e2 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1331,3 +1331,24 @@ # sure you are on the same machine as the QEMU instance. ## { 'command': 'expire_password', 'data': {'protocol': 'str', 'time': 'str'} } + +## +# @eject: +# +# Ejects a device from a removable drive. +# +# @device: The name of the device +# +# @force: @optional If true, eject regardless of whether the drive is locked. +# If not specified, the default value is false. +# +# Returns: Nothing on success +# If @device is not a valid block device, DeviceNotFound +# If @device is not removable and @force is false, DeviceNotRemovable +# If @force is false and @device is locked, DeviceLocked +# +# Notes: Ejecting a device will no media results in success +# +# Since: 0.14.0 +## +{ 'command': 'eject', 'data': {'device': 'str', '*force': 'bool'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index d7264b2dbb..185bebabee 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -84,10 +84,7 @@ EQMP { .name = "eject", .args_type = "force:-f,device:B", - .params = "[-f] device", - .help = "eject a removable medium (use -f to force it)", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_eject, + .mhandler.cmd_new = qmp_marshal_input_eject, }, SQMP |