From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzXeJ-0001Cr-Qo for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzXeI-00024N-PN for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:27 -0400 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:35531 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzXeI-00024D-EM for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:26 -0400 From: Anthony Liguori Date: Fri, 2 Sep 2011 12:34:54 -0500 Message-Id: <1314984898-19141-12-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1314984898-19141-1-git-send-email-aliguori@us.ibm.com> References: <1314984898-19141-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 11/15] qapi: add change-vnc-password (v2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Michael Roth , Luiz Capitulino This is a new QMP only command that only changes the VNC password. Signed-off-by: Anthony Liguori --- v1 -> v2 - fix schema documentation --- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 8 ++++++++ qmp.c | 11 ++++++++++- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index f159d81..350cf1c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -96,3 +96,16 @@ { 'command': 'set-blockdev-password', 'data': {'device': 'str', 'password': 'str'} } +## +# @change-vnc-password: +# +# Change the VNC server password. +# +# @password: the new password to use with VNC authentication +# +# Since: 1.0 +# +# Notes: An empty password in this command will set the password to the empty +# string. Existing clients are unaffected by executing this command. +## +{ 'command': 'change-vnc-password', 'data': {'password': 'str'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index 1de5af5..7df3938 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -868,6 +868,14 @@ Example: EQMP { + .name = "change-vnc-password", + .args_type = "password:s", + .params = "password", + .help = "set vnc password", + .mhandler.cmd_new = qmp_marshal_input_change_vnc_password, + }, + + { .name = "set_password", .args_type = "protocol:s,password:s,connected:s?", .params = "protocol password action-if-connected", diff --git a/qmp.c b/qmp.c index 8aa9c66..f817a88 100644 --- a/qmp.c +++ b/qmp.c @@ -12,9 +12,11 @@ */ #include "qemu-common.h" -#include "sysemu.h" #include "qmp-commands.h" +#include "sysemu.h" +#include "console.h" + NameInfo *qmp_query_name(Error **errp) { NameInfo *info = g_malloc0(sizeof(*info)); @@ -26,3 +28,10 @@ NameInfo *qmp_query_name(Error **errp) return info; } + +void qmp_change_vnc_password(const char *password, Error **err) +{ + if (vnc_display_password(NULL, password) < 0) { + error_set(err, QERR_SET_PASSWD_FAILED); + } +} -- 1.7.4.1