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>
This commit is contained in:
parent
b4ed5d188f
commit
214910a7f8
20
vl.c
20
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
|
/* If no data_dir is specified then try to find it relative to the
|
||||||
executable path. */
|
executable path. */
|
||||||
if (!data_dir) {
|
if (!data_dir) {
|
||||||
|
@ -5523,6 +5513,16 @@ int main(int argc, char **argv, char **envp)
|
||||||
}
|
}
|
||||||
#endif
|
#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()) {
|
if (qemu_init_main_loop()) {
|
||||||
fprintf(stderr, "qemu_init_main_loop failed\n");
|
fprintf(stderr, "qemu_init_main_loop failed\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
Loading…
Reference in New Issue