Commit-ID: 28018481b3271a9a38de1089e5651d74f3f9d202 Gitweb: http://git.kernel.org/tip/28018481b3271a9a38de1089e5651d74f3f9d202 Author: Matt Evans <matt@xxxxxxxxxx> AuthorDate: Fri, 9 Dec 2011 17:55:11 +1100 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Fri, 9 Dec 2011 13:50:52 +0200 kvm tools: Initialise PCI before devices start getting registered with PCI Re-arrange pci__init() in builtin-run such that it comes before devices are initialised. 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 c067685..99db522 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -828,6 +828,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) kvm->nrcpus = nrcpus; + pci__init(); + /* * vidmode should be either specified * either set by default @@ -895,8 +897,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) serial8250__init(kvm); - pci__init(); - if (active_console == CONSOLE_VIRTIO) virtio_console__init(kvm); -- 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
|