Patchwork [03/18] vl: Move init_timer_alarm() earlier

login
register
mail settings
Submitter Corey Minyard
Date July 19, 2012, 6:53 p.m.
Message ID <1342724013-1633-4-git-send-email-minyard@acm.org>
Download mbox | patch
Permalink /patch/172032/
State New
Headers show

Comments

Corey Minyard - July 19, 2012, 6:53 p.m.
From: Corey Minyard <cminyard@mvista.com>

The timers may be used in initialization, so move them earlier so they
are ready.  A reconnect options will be added to qemu-char, and it uses
a timer, but the timer alarm wasn't initialized yet.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
 vl.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/vl.c b/vl.c
index 52b6588..0f0bcd9 100644
--- a/vl.c
+++ b/vl.c
@@ -3245,6 +3245,11 @@  int main(int argc, char **argv, char **envp)
         qemu_set_version(machine->hw_version);
     }
 
+    if (init_timer_alarm() < 0) {
+        fprintf(stderr, "could not initialize alarm timer\n");
+        exit(1);
+    }
+
     /* Init CPU def lists, based on config
      * - Must be called after all the qemu_read_config_file() calls
      * - Must be called before list_cpus()
@@ -3422,11 +3427,6 @@  int main(int argc, char **argv, char **envp)
 
     os_set_line_buffering();
 
-    if (init_timer_alarm() < 0) {
-        fprintf(stderr, "could not initialize alarm timer\n");
-        exit(1);
-    }
-
 #ifdef CONFIG_SPICE
     /* spice needs the timers to be initialized by this point */
     qemu_spice_init();