From 3c301f5573f9657f84f5eafa05a63092a9ab901b Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 29 Mar 2010 16:14:41 -0300 Subject: [PATCH 06/23] Monitor: Convert do_block_set_passwd() to cmd_new_ret() RH-Author: Luiz Capitulino Message-id: <1269879298-30711-7-git-send-email-lcapitulino@redhat.com> Patchwork-id: 8170 O-Subject: [PATCH 06/23] Monitor: Convert do_block_set_passwd() to cmd_new_ret() Bugzilla: 563491 RH-Acked-by: Markus Armbruster RH-Acked-by: Juan Quintela RH-Acked-by: Kevin Wolf Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori (cherry picked from commit ba85d351913a05aac9773fc3924a0264b0e1a833) --- monitor.c | 7 +++++-- qemu-monitor.hx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) Signed-off-by: Eduardo Habkost --- monitor.c | 7 +++++-- qemu-monitor.hx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 7776792..7d13ec6 100644 --- a/monitor.c +++ b/monitor.c @@ -1044,7 +1044,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; @@ -1052,12 +1052,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 63c62fb..33ee661 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1058,7 +1058,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 -- 1.7.0.3