main-loop: unify qemu_init_main_loop between QEMU and tools

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-10-29 15:28:36 +01:00
parent 744ca8e375
commit 172061a0a0
4 changed files with 4 additions and 23 deletions

View File

@ -199,10 +199,13 @@ static int qemu_signal_init(void)
} }
#endif #endif
int main_loop_init(void) int qemu_init_main_loop(void)
{ {
int ret; int ret;
init_clocks();
init_timer_alarm();
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
ret = qemu_signal_init(); ret = qemu_signal_init();
if (ret) { if (ret) {

View File

@ -42,16 +42,6 @@
*/ */
int qemu_init_main_loop(void); int qemu_init_main_loop(void);
/**
* main_loop_init: Initializes main loop
*
* Internal (but shared for compatibility reasons) initialization routine
* for the main loop. This should not be used by applications directly,
* use qemu_init_main_loop() instead.
*
*/
int main_loop_init(void);
/** /**
* main_loop_wait: Run one iteration of the main loop. * main_loop_wait: Run one iteration of the main loop.
* *

View File

@ -92,13 +92,6 @@ void qemu_clock_warp(QEMUClock *clock)
{ {
} }
int qemu_init_main_loop(void)
{
init_clocks();
init_timer_alarm();
return main_loop_init();
}
void slirp_update_timeout(uint32_t *timeout) void slirp_update_timeout(uint32_t *timeout)
{ {
} }

5
vl.c
View File

@ -2357,11 +2357,6 @@ static void free_and_trace(gpointer mem)
free(mem); free(mem);
} }
int qemu_init_main_loop(void)
{
return main_loop_init();
}
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
int i; int i;