[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH 03/18] monitor: Fix double-prompt after "ch
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH 03/18] monitor: Fix double-prompt after "change vnc passwd BLA" |
Date: |
Mon, 7 Dec 2009 21:37:01 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 50c616d..b9d3d92 100644
--- a/monitor.c
+++ b/monitor.c
@@ -845,12 +845,17 @@ static void do_change_block(Monitor *mon, const char
*device,
monitor_read_bdrv_key_start(mon, bs, NULL, NULL);
}
-static void change_vnc_password_cb(Monitor *mon, const char *password,
- void *opaque)
+static void change_vnc_password(Monitor *mon, const char *password)
{
if (vnc_display_password(NULL, password) < 0)
monitor_printf(mon, "could not set VNC server password\n");
+}
+
+static void change_vnc_password_cb(Monitor *mon, const char *password,
+ void *opaque)
+{
+ change_vnc_password(mon, password);
monitor_read_command(mon, 1);
}
@@ -862,7 +867,7 @@ static void do_change_vnc(Monitor *mon, const char *target,
const char *arg)
char password[9];
strncpy(password, arg, sizeof(password));
password[sizeof(password) - 1] = '\0';
- change_vnc_password_cb(mon, password, NULL);
+ change_vnc_password(mon, password);
} else {
monitor_read_password(mon, change_vnc_password_cb, NULL);
}
--
1.6.2.5
- [Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alphabetical order, (continued)
- [Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alphabetical order, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 09/18] QError: New QERR_SET_PASSWD_FAILED, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 13/18] monitor: convert do_closefd() to QError, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 14/18] QError: New QERR_FD_NOT_SUPPLIED, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 06/18] QError: New QERR_DEVICE_NOT_REMOVABLE, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 01/18] QError: new class for device encrypted errors, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 05/18] QError: New QERR_DEVICE_LOCKED, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 11/18] monitor: convert do_change() to QObject, QError, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QError, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 15/18] New QERR_INVALID_PARAMETER, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 03/18] monitor: Fix double-prompt after "change vnc passwd BLA",
Markus Armbruster <=
- [Qemu-devel] [FOR 0.12 PATCH 02/18] monitor: do_cont(): Don't ask for passwords, Markus Armbruster, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH 17/18] monitor: convert do_getfd() to QError, Markus Armbruster, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH 00/18] QError conversions and more, Luiz Capitulino, 2009/12/08