[PATCH 19/28] kvm tools: Perform CPU and firmware setup after devices

Matt Evans
2011-12-06T03:41:36Z

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>
---
tools/kvm/builtin-run.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 32e19e7..576dcfa 100644
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -933,16 +933,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
@@ -966,6 +956,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();