kvm tools: Perform CPU and firmware setup after devices are added

Currently some devices (in this case kbd, fb, vesa) are initialised after
CPU/firmware setup.  On some platforms (e.g. PPC) kvm__arch_setup_firmware() may
be making a device tree.  Any devices added after this point will be missed!

Tiny refactor of builtin-run.c, moving timer start, firmware setup, cpu init
to occur last.

Signed-off-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Matt Evans
2015-06-01 16:39:49 +01:00
committed by Will Deacon
parent b91be96586
commit 25af47ee80
+14 -10
View File
@@ -932,16 +932,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
virtio_net__init(&net_params);
}
kvm__start_timer(kvm);
kvm__arch_setup_firmware(kvm);
for (i = 0; i < nrcpus; i++) {
kvm_cpus[i] = kvm_cpu__init(kvm, i);
if (!kvm_cpus[i])
die("unable to initialize KVM VCPU");
}
kvm__init_ram(kvm);
#ifdef CONFIG_X86
@@ -965,6 +955,20 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
fb__start();
/* Device init all done; firmware init must
* come after this (it may set up device trees etc.)
*/
kvm__start_timer(kvm);
kvm__arch_setup_firmware(kvm);
for (i = 0; i < nrcpus; i++) {
kvm_cpus[i] = kvm_cpu__init(kvm, i);
if (!kvm_cpus[i])
die("unable to initialize KVM VCPU");
}
thread_pool__init(nr_online_cpus);
ioeventfd__start();