monitor: Simplify password input mode (Jan Kiszka)
Drop the hack to query passwords on all monitor terminals now that they are requested when the user initially enters 'continue'. 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@6708 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									c0f4ce7751
								
							
						
					
					
						commit
						f220174de8
					
				
							
								
								
									
										20
									
								
								monitor.c
								
								
								
								
							
							
						
						
									
										20
									
								
								monitor.c
								
								
								
								
							| 
						 | 
				
			
			@ -2912,20 +2912,6 @@ static void monitor_readline_cb(void *opaque, const char *input)
 | 
			
		|||
static void monitor_readline(const char *prompt, int is_password,
 | 
			
		||||
                             char *buf, int buf_size)
 | 
			
		||||
{
 | 
			
		||||
    int i;
 | 
			
		||||
    int old_focus[MAX_MON];
 | 
			
		||||
 | 
			
		||||
    if (is_password) {
 | 
			
		||||
        for (i = 0; i < MAX_MON; i++) {
 | 
			
		||||
            old_focus[i] = 0;
 | 
			
		||||
            if (monitor_hd[i]) {
 | 
			
		||||
                old_focus[i] = monitor_hd[i]->focus;
 | 
			
		||||
                monitor_hd[i]->focus = 0;
 | 
			
		||||
                qemu_chr_send_event(monitor_hd[i], CHR_EVENT_FOCUS);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    readline_start(prompt, is_password, monitor_readline_cb, NULL);
 | 
			
		||||
    monitor_readline_buf = buf;
 | 
			
		||||
    monitor_readline_buf_size = buf_size;
 | 
			
		||||
| 
						 | 
				
			
			@ -2933,12 +2919,6 @@ static void monitor_readline(const char *prompt, int is_password,
 | 
			
		|||
    while (monitor_readline_started) {
 | 
			
		||||
        main_loop_wait(10);
 | 
			
		||||
    }
 | 
			
		||||
    /* restore original focus */
 | 
			
		||||
    if (is_password) {
 | 
			
		||||
        for (i = 0; i < MAX_MON; i++)
 | 
			
		||||
            if (old_focus[i])
 | 
			
		||||
                monitor_hd[i]->focus = old_focus[i];
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int monitor_read_bdrv_key(BlockDriverState *bs)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue