[Qemu-devel] [5967] Accept password as an argument to 'change vnc password' monitor command (Chris Webb)

[Qemu-devel] [5967] Accept password as an argument to 'change vnc password' monitor command (Chris Webb)

[Anthony Liguori]

Revision: 5967
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5967
Author:   aliguori
Date:     2008-12-10 15:14:13 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Accept password as an argument to 'change vnc password' monitor command (Chris Webb)

This allows easier use of the change vnc password monitor command from
management scripts, without having to implement expect(1)-like behaviour.

Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/monitor.c
    trunk/qemu-doc.texi

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c	2008-12-10 15:12:57 UTC (rev 5966)
+++ trunk/monitor.c	2008-12-10 15:14:13 UTC (rev 5967)
@@ -429,12 +429,16 @@
     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] = '\0';
+	} 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 {
@@ -443,12 +447,12 @@
     }
 }
 
-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);
     }
 }
 

Modified: trunk/qemu-doc.texi
===================================================================
--- trunk/qemu-doc.texi	2008-12-10 15:12:57 UTC (rev 5966)
+++ trunk/qemu-doc.texi	2008-12-10 15:14:13 UTC (rev 5967)
@@ -1241,11 +1241,11 @@
 (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