diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-02-10 23:49:52 -0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-19 15:18:16 -0600 |
| commit | ba85d351913a05aac9773fc3924a0264b0e1a833 (patch) | |
| tree | 74acc3c33e9f93146706c53a297201d368dcfa73 | |
| parent | 584cbdb59682db8f052167dd644083076d079890 (diff) | |
| download | qemu-ba85d351913a05aac9773fc3924a0264b0e1a833.zip qemu-ba85d351913a05aac9773fc3924a0264b0e1a833.tar.gz qemu-ba85d351913a05aac9773fc3924a0264b0e1a833.tar.bz2 | |
Monitor: Convert do_block_set_passwd() to cmd_new_ret()
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | monitor.c | 7 | ||||
| -rw-r--r-- | qemu-monitor.hx | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -1006,7 +1006,7 @@ static int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) return eject_device(mon, bs, force); } -static void do_block_set_passwd(Monitor *mon, const QDict *qdict, +static int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data) { BlockDriverState *bs; @@ -1014,12 +1014,15 @@ static void do_block_set_passwd(Monitor *mon, const QDict *qdict, bs = bdrv_find(qdict_get_str(qdict, "device")); if (!bs) { qemu_error_new(QERR_DEVICE_NOT_FOUND, qdict_get_str(qdict, "device")); - return; + return -1; } if (bdrv_set_key(bs, qdict_get_str(qdict, "password")) < 0) { qemu_error_new(QERR_INVALID_PASSWORD); + return -1; } + + return 0; } static void do_change_block(Monitor *mon, const char *device, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 835fd05..d2be5c4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1117,7 +1117,7 @@ ETEXI .params = "block_passwd device password", .help = "set the password of encrypted block devices", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_block_set_passwd, + .cmd_new_ret = do_block_set_passwd, }, STEXI |