commit 214910a7f826ca0cda328b93217e5448f76e19bf
author Marcelo Tosatti <mtosatti@redhat.com> Fri Sep 18 02:41:23 2009 -0300
committer Aurelien Jarno <aurelien@aurel32.net> Sat Sep 26 23:39:09 2009 +0200
tree 2994a295f079b924ed404999f719d5367ccb7845
parent b4ed5d188f30c738035b50e7c865782f73f7171f

fix -daemonize with kvm

Otherwise fork might not inherit state initialized by kvm_init().

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

vl.c

diff --git a/vl.c b/vl.c
index e7d9232..e12f1d3 100644
--- a/vl.c
+++ b/vl.c
@@ -5424,16 +5424,6 @@
         }
     }
 
-    if (kvm_enabled()) {
-        int ret;
-
-        ret = kvm_init(smp_cpus);
-        if (ret < 0) {
-            fprintf(stderr, "failed to initialize KVM\n");
-            exit(1);
-        }
-    }
-
     /* If no data_dir is specified then try to find it relative to the
        executable path.  */
     if (!data_dir) {
@@ -5523,6 +5513,16 @@
     }
 #endif
 
+    if (kvm_enabled()) {
+        int ret;
+
+        ret = kvm_init(smp_cpus);
+        if (ret < 0) {
+            fprintf(stderr, "failed to initialize KVM\n");
+            exit(1);
+        }
+    }
+
     if (qemu_init_main_loop()) {
         fprintf(stderr, "qemu_init_main_loop failed\n");
         exit(1);