From 4d2855a348c5e90f56584ab9777fc877965ca2e0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 29 Jan 2015 10:37:00 +0100 Subject: block: New bdrv_add_key(), convert monitor to use it Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-id: 1422524221-8566-4-git-send-email-armbru@redhat.com Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- qmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qmp.c') diff --git a/qmp.c b/qmp.c index 7f2d25a..20a9e97 100644 --- a/qmp.c +++ b/qmp.c @@ -154,6 +154,7 @@ SpiceInfo *qmp_query_spice(Error **errp) void qmp_cont(Error **errp) { + Error *local_err = NULL; BlockDriverState *bs; if (runstate_needs_reset()) { @@ -167,10 +168,9 @@ void qmp_cont(Error **errp) bdrv_iostatus_reset(bs); } for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { - if (bdrv_key_required(bs)) { - error_set(errp, QERR_DEVICE_ENCRYPTED, - bdrv_get_device_name(bs), - bdrv_get_encrypted_filename(bs)); + bdrv_add_key(bs, NULL, &local_err); + if (local_err) { + error_propagate(errp, local_err); return; } } -- cgit v1.1