summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorKirill Batuzov <batuzovk@ispras.ru>2014-05-06 16:59:53 +0400
committerStefan Hajnoczi <stefanha@redhat.com>2014-05-09 20:57:32 +0200
commit02ce232c5051854bf49e6d2816c65e00f6d7e036 (patch)
treeb250aca2293310da6fbf6a396a6f34dd67f9df84 /vl.c
parentb1e6fc0817dca14a3581d7b0979a5885608981f2 (diff)
downloadqemu-02ce232c5051854bf49e6d2816c65e00f6d7e036.tar.gz
vl.c: remove init_clocks call from main
Clocks are initialized in qemu_init_main_loop. They are not needed before it. Initializing them twice is not only unnecessary but is harmful: it results in memory leak and potentially can lead to a situation where different parts of QEMU use different sets of timers. To avoid it remove init_clocks call from main and add an assertion to qemu_clock_init that corresponding clock has not been initialized yet. Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 73e06610b0..709d8cda8d 100644
--- a/vl.c
+++ b/vl.c
@@ -3024,7 +3024,6 @@ int main(int argc, char **argv, char **envp)
runstate_init();
- init_clocks();
rtc_clock = QEMU_CLOCK_HOST;
qemu_init_auxval(envp);