From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LAQlq-000461-Gm for qemu-devel@nongnu.org; Wed, 10 Dec 2008 10:14:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LAQlp-00045N-Of for qemu-devel@nongnu.org; Wed, 10 Dec 2008 10:14:38 -0500 Received: from [199.232.76.173] (port=43489 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LAQlp-00045I-Ki for qemu-devel@nongnu.org; Wed, 10 Dec 2008 10:14:37 -0500 Received: from yx-out-1718.google.com ([74.125.44.154]:18639) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LAQlp-0000KQ-Bi for qemu-devel@nongnu.org; Wed, 10 Dec 2008 10:14:37 -0500 Received: by yx-out-1718.google.com with SMTP id 3so237112yxi.82 for ; Wed, 10 Dec 2008 07:14:36 -0800 (PST) Message-ID: <493FDCD8.8020104@codemonkey.ws> Date: Wed, 10 Dec 2008 09:14:32 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <20081123113147.GA12832@arachsys.com> <20081123123101.GC17042@networkno.de> <20081125100935.GI2380@arachsys.com> <20081125102502.GJ2380@arachsys.com> <20081208140949.GG19711@arachsys.com> In-Reply-To: <20081208140949.GG19711@arachsys.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [RESEND] [PATCH v2] Accept password as an argument to 'change vnc password' Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chris Webb Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Chris Webb wrote: > Accept password as an argument to 'change vnc password' monitor command > > 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 > Applied. Thanks. Regards, Anthony Liguori > --- > 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] = '\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 { > @@ -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 >