From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Evans Subject: [PATCH V2 15/23] kvm tools: Perform CPU and firmware setup after devices are added Date: Fri, 09 Dec 2011 17:55:16 +1100 Message-ID: <4EE1B0D4.10000@ozlabs.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: penberg@kernel.org, asias.hejun@gmail.com, levinsasha928@gmail.com, gorcunov@gmail.com To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Return-path: In-Reply-To: Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org 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 --- 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 99db522..7491428 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -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();