From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MoWEd-0001Dv-RI
	for qemu-devel@nongnu.org; Fri, 18 Sep 2009 01:42:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MoWEY-0001Dj-TX
	for qemu-devel@nongnu.org; Fri, 18 Sep 2009 01:42:18 -0400
Received: from [199.232.76.173] (port=55640 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MoWEY-0001Dg-ON
	for qemu-devel@nongnu.org; Fri, 18 Sep 2009 01:42:14 -0400
Received: from mx1.redhat.com ([209.132.183.28]:50932)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mtosatti@redhat.com>) id 1MoWEY-0004so-5u
	for qemu-devel@nongnu.org; Fri, 18 Sep 2009 01:42:14 -0400
Date: Fri, 18 Sep 2009 02:41:23 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20090918054123.GA30685@amt.cnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] fix -daemonize with kvm
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org


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

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/vl.c b/vl.c
index eb01da7..7e62a65 100644
--- a/vl.c
+++ b/vl.c
@@ -5424,16 +5424,6 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
-    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 @@ int main(int argc, char **argv, char **envp)
     }
 #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);