From patchwork Fri Sep 18 05:41:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 33819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3BF50B7B69 for ; Fri, 18 Sep 2009 15:43:11 +1000 (EST) Received: from localhost ([127.0.0.1]:33043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoWFQ-0001E0-7z for incoming@patchwork.ozlabs.org; Fri, 18 Sep 2009 01:43:08 -0400 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 ) id 1MoWEY-0004so-5u for qemu-devel@nongnu.org; Fri, 18 Sep 2009 01:42:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8I5gCBH011011; Fri, 18 Sep 2009 01:42:12 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8I5gB6r025494; Fri, 18 Sep 2009 01:42:11 -0400 Received: from amt.cnet (vpn-10-36.str.redhat.com [10.32.10.36]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n8I5g9Ac014663; Fri, 18 Sep 2009 01:42:10 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 47AB8588074; Fri, 18 Sep 2009 02:41:30 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id n8I5fNj8031061; Fri, 18 Sep 2009 02:41:23 -0300 Date: Fri, 18 Sep 2009 02:41:23 -0300 From: Marcelo Tosatti To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: <20090918054123.GA30685@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] fix -daemonize with kvm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Otherwise fork might not inherit state initialized by kvm_init(). Signed-off-by: Marcelo Tosatti 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);