From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 29 Oct 2012 14:28:36 +0000 (+0100)
Subject: main-loop: unify qemu_init_main_loop between QEMU and tools
X-Git-Tag: v1.3.0-rc0~89^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=172061a0a0d98c974ea8d5ed715195237bc44225;p=thirdparty%2Fqemu.git

main-loop: unify qemu_init_main_loop between QEMU and tools

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/main-loop.c b/main-loop.c
index eb3b6e62536..baefe413d10 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -199,10 +199,13 @@ static int qemu_signal_init(void)
 }
 #endif
 
-int main_loop_init(void)
+int qemu_init_main_loop(void)
 {
     int ret;
 
+    init_clocks();
+    init_timer_alarm();
+
     qemu_mutex_lock_iothread();
     ret = qemu_signal_init();
     if (ret) {
diff --git a/main-loop.h b/main-loop.h
index dce1cd9d7ca..91a0aff9c75 100644
--- a/main-loop.h
+++ b/main-loop.h
@@ -42,16 +42,6 @@
  */
 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.
  *
diff --git a/qemu-tool.c b/qemu-tool.c
index 84273ae077d..28a4e8d42af 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -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)
 {
 }
diff --git a/vl.c b/vl.c
index 9f99ef4763c..b3186fa425e 100644
--- a/vl.c
+++ b/vl.c
@@ -2357,11 +2357,6 @@ static void free_and_trace(gpointer mem)
     free(mem);
 }
 
-int qemu_init_main_loop(void)
-{
-    return main_loop_init();
-}
-
 int main(int argc, char **argv, char **envp)
 {
     int i;