vl: unify calls to init_timer_alarm
init_timer_alarm was being called twice. This is not needed. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
		
							parent
							
								
									c8122c35e6
								
							
						
					
					
						commit
						f9ab4654e3
					
				@ -123,7 +123,10 @@ int qemu_init_main_loop(void)
 | 
				
			|||||||
    GSource *src;
 | 
					    GSource *src;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    init_clocks();
 | 
					    init_clocks();
 | 
				
			||||||
    init_timer_alarm();
 | 
					    if (init_timer_alarm() < 0) {
 | 
				
			||||||
 | 
					        fprintf(stderr, "could not initialize alarm timer\n");
 | 
				
			||||||
 | 
					        exit(1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qemu_mutex_lock_iothread();
 | 
					    qemu_mutex_lock_iothread();
 | 
				
			||||||
    ret = qemu_signal_init();
 | 
					    ret = qemu_signal_init();
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										5
									
								
								vl.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								vl.c
									
									
									
									
									
								
							@ -3616,11 +3616,6 @@ int main(int argc, char **argv, char **envp)
 | 
				
			|||||||
            add_device_config(DEV_VIRTCON, "vc:80Cx24C");
 | 
					            add_device_config(DEV_VIRTCON, "vc:80Cx24C");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (init_timer_alarm() < 0) {
 | 
					 | 
				
			||||||
        fprintf(stderr, "could not initialize alarm timer\n");
 | 
					 | 
				
			||||||
        exit(1);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    socket_init();
 | 
					    socket_init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0)
 | 
					    if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user