[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between QEMU and tools |
Date: |
Mon, 29 Oct 2012 19:07:16 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
main-loop.c | 5 ++++-
main-loop.h | 10 ----------
qemu-tool.c | 7 -------
vl.c | 5 -----
4 file modificati, 4 inserzioni(+), 23 rimozioni(-)
diff --git a/main-loop.c b/main-loop.c
index eb3b6e6..baefe41 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 dce1cd9..91a0aff 100644
--- a/main-loop.h
+++ b/main-loop.h
@@ -43,16 +43,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.
*
* If @nonblocking is true, poll for events, otherwise suspend until
diff --git a/qemu-tool.c b/qemu-tool.c
index 84273ae..28a4e8d 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 6dd767c..3f090f8 100644
--- a/vl.c
+++ b/vl.c
@@ -2369,11 +2369,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;
--
1.7.12.1
- [Qemu-devel] [PATCH 00/11] Trim dependencies of qemu-ga, vscclient, tests, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 01/11] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 03/11] compiler: use weak aliases to provide default definitions, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 02/11] build: move cutils.o and qemu-timer-common.o to oslib-obj-y, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 04/11] sockets: use weak aliases instead of qemu-tool.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 05/11] fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 06/11] iohandler: add weak alias in qemu-sockets.c, for qemu-ga, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 07/11] win32: add weak version of qemu_fd_register, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between QEMU and tools,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/11] qemu-tool: do not depend on qemu-timer.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 11/11] build: do not include main loop where it is not actually used, Paolo Bonzini, 2012/10/29