Merge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-merge

* commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04':
  monitor: Introduce 'block_passwd' command
  QError: Add class for invalid passwords

Conflicts:
	qemu-monitor.hx

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/monitor.c b/monitor.c
index ee45a63ee..06d16462f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -801,6 +801,22 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
     eject_device(mon, bs, force);
 }
 
+static void do_block_set_passwd(Monitor *mon, const QDict *qdict,
+                                QObject **ret_data)
+{
+    BlockDriverState *bs;
+
+    bs = bdrv_find(qdict_get_str(qdict, "device"));
+    if (!bs) {
+        qemu_error_new(QERR_DEVICE_NOT_FOUND, qdict_get_str(qdict, "device"));
+        return;
+    }
+
+    if (bdrv_set_key(bs, qdict_get_str(qdict, "password")) < 0) {
+        qemu_error_new(QERR_INVALID_PASSWORD);
+    }
+}
+
 static void do_change_block(Monitor *mon, const char *device,
                             const char *filename, const char *fmt)
 {