Commit-ID: 11c71f4278c76ffd35c47f9afbafa967f097ff58 Gitweb: http://git.kernel.org/tip/11c71f4278c76ffd35c47f9afbafa967f097ff58 Author: Matt Evans <matt@xxxxxxxxxx> AuthorDate: Fri, 9 Dec 2011 17:55:21 +1100 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Fri, 9 Dec 2011 13:51:16 +0200 kvm tools: Init IRQs after determining nrcpus IRQ init may involve per-CPU setup/allocation of resources, so make sure kvm->nrcpus is initialised before calling irq__init(). Signed-off-by: Matt Evans <matt@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 7491428..7969901 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -809,8 +809,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) kvm = kvm__init(dev, ram_size, guest_name); - irq__init(kvm); - kvm->single_step = single_step; ioeventfd__init(); @@ -828,6 +826,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) kvm->nrcpus = nrcpus; + irq__init(kvm); + pci__init(); /* -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|