From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStlB-0003cd-RK for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TStlA-0005kb-LF for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:25 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:61159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TStlA-0005ZP-EC for qemu-devel@nongnu.org; Mon, 29 Oct 2012 14:08:24 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so3395861pad.4 for ; Mon, 29 Oct 2012 11:08:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 29 Oct 2012 19:07:16 +0100 Message-Id: <1351534038-15503-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> References: <1351534038-15503-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between QEMU and tools List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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