aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-11-02 15:43:23 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-02 13:07:54 -0500
commitf9ab4654e370ceedb745523b607a628e297cb6ab (patch)
tree35194bbb9fb307d3f2ed9043dfbaddc279188ffe
parentc8122c35e611385b31e2d8ccb059d0687540244a (diff)
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>
-rw-r--r--main-loop.c5
-rw-r--r--vl.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/main-loop.c b/main-loop.c
index e43c7c8e8d..234a3130c2 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -123,7 +123,10 @@ int qemu_init_main_loop(void)
GSource *src;
init_clocks();
- init_timer_alarm();
+ if (init_timer_alarm() < 0) {
+ fprintf(stderr, "could not initialize alarm timer\n");
+ exit(1);
+ }
qemu_mutex_lock_iothread();
ret = qemu_signal_init();
diff --git a/vl.c b/vl.c
index 99681dabf5..e2d5276988 100644
--- a/vl.c
+++ b/vl.c
@@ -3616,11 +3616,6 @@ int main(int argc, char **argv, char **envp)
add_device_config(DEV_VIRTCON, "vc:80Cx24C");
}
- if (init_timer_alarm() < 0) {
- fprintf(stderr, "could not initialize alarm timer\n");
- exit(1);
- }
-
socket_init();
if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0)