From 214910a7f826ca0cda328b93217e5448f76e19bf Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Fri, 18 Sep 2009 02:41:23 -0300 Subject: [PATCH] fix -daemonize with kvm Otherwise fork might not inherit state initialized by kvm_init(). Signed-off-by: Marcelo Tosatti Signed-off-by: Aurelien Jarno --- vl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vl.c b/vl.c index e7d923265e..e12f1d3ee0 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);