From fd04a2aedae37dc9f481225f445d04bddd1590b0 Mon Sep 17 00:00:00 2001 From: Shahar Havivi Date: Sat, 6 Mar 2010 00:26:13 +0200 Subject: Wrong error message in block_passwd command Signed-off-by: Shahar Havivi Signed-off-by: Anthony Liguori --- monitor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index f0ec84d..0448a70 100644 --- a/monitor.c +++ b/monitor.c @@ -1057,6 +1057,7 @@ static int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data) { BlockDriverState *bs; + int err; bs = bdrv_find(qdict_get_str(qdict, "device")); if (!bs) { @@ -1064,7 +1065,11 @@ static int do_block_set_passwd(Monitor *mon, const QDict *qdict, return -1; } - if (bdrv_set_key(bs, qdict_get_str(qdict, "password")) < 0) { + err = bdrv_set_key(bs, qdict_get_str(qdict, "password")); + if (err == -EINVAL) { + qerror_report(QERR_DEVICE_NOT_ENCRYPTED, bdrv_get_device_name(bs)); + return -1; + } else if (err < 0) { qerror_report(QERR_INVALID_PASSWORD); return -1; } -- cgit v1.1