From c245b6a37d76670c3ba7b9063bac943bb998bb7c Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 7 Dec 2011 16:02:36 -0200 Subject: qapi: Convert eject Signed-off-by: Anthony Liguori Signed-off-by: Luiz Capitulino --- blockdev.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'blockdev.c') 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) -- cgit v1.2.1