> ---
> monitor.c | 14 +++++++++-----
> qemu-doc.texi | 8 ++++----
> 2 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index a252838..f6a2783 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -428,12 +428,16 @@ static void do_change_block(const char *device, const char *filename, const char
> qemu_key_check(bs, filename);
> }
>
> -static void do_change_vnc(const char *target)
> +static void do_change_vnc(const char *target, const char *arg)
> {
> if (strcmp(target, "passwd") == 0 ||
> strcmp(target, "password") == 0) {
> char password[9];
> - monitor_readline("Password: ", 1, password, sizeof(password));
> + if (arg) {
> + strncpy(password, arg, sizeof(password));
> + password[sizeof(password) - 1] = '__PLACEHOLDER__1_';
> + } else
> + monitor_readline("Password: ", 1, password, sizeof(password));
> if (vnc_display_password(NULL, password) < 0)
> term_printf("could not set VNC server password\n");
> } else {
> @@ -442,12 +446,12 @@ static void do_change_vnc(const char *target)
> }
> }
>
> -static void do_change(const char *device, const char *target, const char *fmt)
> +static void do_change(const char *device, const char *target, const char *arg)
> {
> if (strcmp(device, "vnc") == 0) {
> - do_change_vnc(target);
> + do_change_vnc(target, arg);
> } else {
> - do_change_block(device, target, fmt);
> + do_change_block(device, target, arg);
> }
> }
>
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index 1735d92..ca3b181 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -1233,11 +1233,11 @@ and @var{options} are described at @ref{sec_invocation}. eg
> (qemu) change vnc localhost:1
> @end example
>
> -@item change vnc password
> +@item change vnc password [@var{password}]
>
> -Change the password associated with the VNC server. The monitor will prompt for
> -the new password to be entered. VNC passwords are only significant upto 8 letters.
> -eg.
> +Change the password associated with the VNC server. If the new password is not
> +supplied, the monitor will prompt for it to be entered. VNC passwords are only
> +significant up to 8 letters. eg
>
> @example
> (qemu) change vnc password
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
>
