diff options
author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-05 23:01:01 +0000 |
---|---|---|
committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-05 23:01:01 +0000 |
commit | c0f4ce7751f0b9a9a7815f931a09a6c3de127cee (patch) | |
tree | 6a72e9f9853916adad4f98493e01392d8d8d6aa9 /console.h | |
parent | 430eb509d2d05bd568c1394213fd12cb447467a7 (diff) | |
download | qemu-c0f4ce7751f0b9a9a7815f931a09a6c3de127cee.zip qemu-c0f4ce7751f0b9a9a7815f931a09a6c3de127cee.tar.gz qemu-c0f4ce7751f0b9a9a7815f931a09a6c3de127cee.tar.bz2 |
monitor: Rework early disk password inquiry (Jan Kiszka)
Reading the passwords for encrypted hard disks during early startup is
broken (I guess for quiet a while now):
- No monitor terminal is ready for input at this point
- Forcing all mux'ed terminals into monitor mode can confuse other
users of that channels
To overcome these issues and to lay the ground for a clean decoupling of
monitor terminals, this patch changes the initial password inquiry as
follows:
- Prevent autostart if there is some encrypted disk
- Once the user tries to resume the VM, prompt for all missing
passwords
- Only resume if all passwords were accepted
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6707 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'console.h')
-rw-r--r-- | console.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -302,10 +302,9 @@ void term_printf(const char *fmt, ...) __attribute__ ((__format__ (__printf__, 1 void term_print_filename(const char *filename); void term_flush(void); void term_print_help(void); -void monitor_readline(const char *prompt, int is_password, - char *buf, int buf_size); void monitor_suspend(void); void monitor_resume(void); +int monitor_read_bdrv_key(BlockDriverState *bs); /* readline.c */ typedef void ReadLineFunc(void *opaque, const char *str); |